jeans/motioneyeos
jeans/motioneyeos
1
0
Fork 0
mirror of https://github.com/motioneye-project/motioneyeos.git synced 2025-07-29 06:06:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

makedevs: Add support for 16-bit major/minor numbers

Browse Source 
Closes #2647

[Peter: Adjust for the real 12bit majors/20bit minors supported by Linux]
Signed-off-by: Matt Fleming <matthew.fleming@imgtec.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
This commit is contained in:
Matt Fleming 2010-09-24 14:43:17 +01:00 committed by Peter Korsgaard
parent a7f40dfc1b
commit 7879a4ba3f
2 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
CHANGES
View File

@ -18,13 +18,13 @@
hostapd, i2c-tools, icu, input-tools, iproute2, iptables, hostapd, i2c-tools, icu, input-tools, iproute2, iptables,
jpeg, libaio, libcap, libconfig, libglib2, libogg, libtheora, jpeg, libaio, libcap, libconfig, libglib2, libogg, libtheora,
libtool, libvorbis, libxml2, libxslt, linux-fusion, lsof, libtool, libvorbis, libxml2, libxslt, linux-fusion, lsof,
ltp-testsuite, ltrace, lvm2, m4, memtester, mesa3d, mii-diag, ltp-testsuite, ltrace, lvm2, m4, makedevs, memtester, mesa3d,
mpc, mpfr, mplayer, mrouted, nano, netperf, netplug, openssh, mii-diag, mpc, mpfr, mplayer, mrouted, nano, netperf, netplug,
openssl, openvpn, oprofile, pango, patch, pciutils, php, openssh, openssl, openvpn, oprofile, pango, patch, pciutils,
portmap, qt, rsync, screen, sdl_gfx, sdl_sound, sqlite, squid, php, portmap, qt, rsync, screen, sdl_gfx, sdl_sound, sqlite,
sstrip, sysklogd, sysvinit, tar, tslib, udev, usbutils, vim, squid, sstrip, sysklogd, sysvinit, tar, tslib, udev, usbutils,
vtun, webkit, xapp_xlogo, xkeyboard-config, xlib_libX11, xz, vim, vtun, webkit, xapp_xlogo, xkeyboard-config, xlib_libX11,
zlib xz, zlib
New packages: dhrystone, fbgrab, irda-utils, libao, lsuio, New packages: dhrystone, fbgrab, irda-utils, libao, lsuio,
rsh-redone, sdparm, vorbis-tools, whetstone, xl2tp rsh-redone, sdparm, vorbis-tools, whetstone, xl2tp
@ -37,6 +37,7 @@
#561: ltp-testsuite failed to install #561: ltp-testsuite failed to install
#1651: Build fail caused by ccache in module-init-tools #1651: Build fail caused by ccache in module-init-tools
#1735: [PATCH] mplayer: convert to autotools infrastructure #1735: [PATCH] mplayer: convert to autotools infrastructure
#2647: makedevs package lacks support for 16-bit major/minor numbers
#2371: QT MYSQL Module does not build when MySQL installed on the host #2371: QT MYSQL Module does not build when MySQL installed on the host
#2905: Qt: Speed up compilation, if gui-module isn't selected #2905: Qt: Speed up compilation, if gui-module isn't selected
#2929: genext2fs: couldn't allocate a block (no free space) #2929: genext2fs: couldn't allocate a block (no free space)

4
package/makedevs/makedevs.c
View File

@ -414,7 +414,7 @@ int main(int argc, char **argv)
if ((2 > sscanf(line, "%40s %c %o %40s %40s %u %u %u %u %u", name, if ((2 > sscanf(line, "%40s %c %o %40s %40s %u %u %u %u %u", name,
&type, &mode, user, group, &major, &type, &mode, user, group, &major,
&minor, &start, &increment, &count)) || &minor, &start, &increment, &count)) ||
((major | minor | start | count | increment) > 255)) ((major | minor | start | count | increment) > 0xfffff))
{ {
if (*line=='\0' || *line=='#' || isspace(*line)) if (*line=='\0' || *line=='#' || isspace(*line))
continue; continue;
@ -488,7 +488,7 @@ int main(int argc, char **argv)
int i; int i;
char *full_name_inc; char *full_name_inc;
full_name_inc = xmalloc(strlen(full_name) + 4); full_name_inc = xmalloc(strlen(full_name) + 8);
for (i = start; i < count; i++) { for (i = start; i < count; i++) {
sprintf(full_name_inc, "%s%d", full_name, i); sprintf(full_name_inc, "%s%d", full_name, i);
rdev = makedev(major, minor + (i * increment - start)); rdev = makedev(major, minor + (i * increment - start));