svn commit: trunk/busybox: console-tools coreutils debianutils incl etc...
vda at busybox.net
vda at busybox.net
Tue Apr 22 00:16:29 UTC 2008
Author: vda
Date: 2008-04-21 17:16:29 -0700 (Mon, 21 Apr 2008)
New Revision: 21794
Log:
whitespace fixes. no code changes
Modified:
trunk/busybox/console-tools/openvt.c
trunk/busybox/coreutils/mv.c
trunk/busybox/debianutils/start_stop_daemon.c
trunk/busybox/include/applets.h
trunk/busybox/include/usage.h
trunk/busybox/miscutils/fbsplash.c
trunk/busybox/miscutils/man.c
trunk/busybox/util-linux/Config.in
trunk/busybox/util-linux/mdev.c
Changeset:
Modified: trunk/busybox/console-tools/openvt.c
===================================================================
--- trunk/busybox/console-tools/openvt.c 2008-04-22 00:08:27 UTC (rev 21793)
+++ trunk/busybox/console-tools/openvt.c 2008-04-22 00:16:29 UTC (rev 21794)
@@ -60,7 +60,7 @@
/* Do we, by chance, already have it? */
for (fd = 0; fd < 3; fd++)
if (!not_vt_fd(fd))
- return fd;
+ return fd;
/* _only_ O_NONBLOCK: ask for neither read not write perms */
fd = open(DEV_CONSOLE, O_NONBLOCK);
if (fd >= 0 && !not_vt_fd(fd))
@@ -73,7 +73,7 @@
int vtno;
int fd = get_vt_fd();
- errno = 0;
+ errno = 0;
/*xfunc_error_retval = 3; - do we need compat? */
if (ioctl(fd, VT_OPENQRY, &vtno) != 0 || vtno <= 0)
bb_perror_msg_and_die("can't find open VT");
@@ -138,7 +138,7 @@
close(0);
/*setsid(); - BAD IDEA: after we exit, child is SIGHUPed... */
xopen(vtname, O_RDWR);
- xioctl(0, VT_GETSTATE, &vtstat);
+ xioctl(0, VT_GETSTATE, &vtstat);
if (flags & OPT_s) {
xioctl(0, VT_ACTIVATE, (void*)(ptrdiff_t)vtno);
Modified: trunk/busybox/coreutils/mv.c
===================================================================
--- trunk/busybox/coreutils/mv.c 2008-04-22 00:08:27 UTC (rev 21793)
+++ trunk/busybox/coreutils/mv.c 2008-04-22 00:16:29 UTC (rev 21794)
@@ -109,7 +109,7 @@
goto RET_1;
}
}
- /* FILEUTILS_RECUR also prevents nasties like
+ /* FILEUTILS_RECUR also prevents nasties like
* "read from device and write contents to dst"
* instead of "create same device node" */
copy_flag = FILEUTILS_RECUR | FILEUTILS_PRESERVE_STATUS;
Modified: trunk/busybox/debianutils/start_stop_daemon.c
===================================================================
--- trunk/busybox/debianutils/start_stop_daemon.c 2008-04-22 00:08:27 UTC (rev 21793)
+++ trunk/busybox/debianutils/start_stop_daemon.c 2008-04-22 00:16:29 UTC (rev 21794)
@@ -142,18 +142,18 @@
procdir = xopendir("/proc");
pid = 0;
- while(1) {
- errno = 0; /* clear any previous error */
- entry = readdir(procdir);
+ while(1) {
+ errno = 0; /* clear any previous error */
+ entry = readdir(procdir);
// TODO: check for exact errno(s) which mean that we got stale entry
- if (errno) /* Stale entry, process has died after opendir */
- continue;
- if (!entry) /* EOF, no more entries */
- break;
- pid = bb_strtou(entry->d_name, NULL, 10);
- if (errno) /* NaN */
- continue;
- check(pid);
+ if (errno) /* Stale entry, process has died after opendir */
+ continue;
+ if (!entry) /* EOF, no more entries */
+ break;
+ pid = bb_strtou(entry->d_name, NULL, 10);
+ if (errno) /* NaN */
+ continue;
+ check(pid);
}
closedir(procdir);
if (!pid)
Modified: trunk/busybox/include/applets.h
===================================================================
--- trunk/busybox/include/applets.h 2008-04-22 00:08:27 UTC (rev 21793)
+++ trunk/busybox/include/applets.h 2008-04-22 00:16:29 UTC (rev 21794)
@@ -231,7 +231,7 @@
USE_LSMOD(APPLET(lsmod, _BB_DIR_SBIN, _BB_SUID_NEVER))
USE_UNLZMA(APPLET_ODDNAME(lzmacat, unlzma, _BB_DIR_USR_BIN, _BB_SUID_NEVER, lzmacat))
USE_MAKEDEVS(APPLET(makedevs, _BB_DIR_SBIN, _BB_SUID_NEVER))
-USE_MAN(APPLET(man, _BB_DIR_SBIN, _BB_SUID_NEVER))
+USE_MAN(APPLET(man, _BB_DIR_SBIN, _BB_SUID_NEVER))
USE_MATCHPATHCON(APPLET(matchpathcon, _BB_DIR_USR_SBIN, _BB_SUID_NEVER))
USE_MD5SUM(APPLET_ODDNAME(md5sum, md5_sha1_sum, _BB_DIR_USR_BIN, _BB_SUID_NEVER, md5sum))
USE_MDEV(APPLET(mdev, _BB_DIR_SBIN, _BB_SUID_NEVER))
Modified: trunk/busybox/include/usage.h
===================================================================
--- trunk/busybox/include/usage.h 2008-04-22 00:08:27 UTC (rev 21793)
+++ trunk/busybox/include/usage.h 2008-04-22 00:16:29 UTC (rev 21794)
@@ -521,7 +521,7 @@
#define cpio_trivial_usage \
"-[dim" USE_FEATURE_CPIO_O("o") "tuv][F cpiofile]" \
- USE_FEATURE_CPIO_O( "[H newc]" )
+ USE_FEATURE_CPIO_O( "[H newc]" )
#define cpio_full_usage "\n\n" \
"Extract or list files from a cpio archive" \
USE_FEATURE_CPIO_O( ", or create a cpio archive" ) \
Modified: trunk/busybox/miscutils/fbsplash.c
===================================================================
--- trunk/busybox/miscutils/fbsplash.c 2008-04-22 00:08:27 UTC (rev 21793)
+++ trunk/busybox/miscutils/fbsplash.c 2008-04-22 00:16:29 UTC (rev 21794)
@@ -9,11 +9,11 @@
* - use kernel option 'vga=xxx' or otherwise enable framebuffer device.
* - put somewhere fbsplash.cfg file and an image in .ppm format.
* - run applet: $ setsid fbsplash [params] &
- * -c: hide cursor
- * -d /dev/fbN: framebuffer device (if not /dev/fb0)
- * -s path_to_image_file (can be "-" for stdin)
- * -i path_to_cfg_file
- * -f path_to_fifo (can be "-" for stdin)
+ * -c: hide cursor
+ * -d /dev/fbN: framebuffer device (if not /dev/fb0)
+ * -s path_to_image_file (can be "-" for stdin)
+ * -i path_to_cfg_file
+ * -f path_to_fifo (can be "-" for stdin)
* - if you want to run it only in presence of a kernel parameter
* (for example fbsplash=on), use:
* grep -q "fbsplash=on" </proc/cmdline && setsid fbsplash [params]
@@ -147,7 +147,7 @@
ngreen >>= 2; // 6-bit green
nblue >>= 3; // 5-bit blue
thispix = nblue + (ngreen << 5) + (nred << (5+6));
-
+
cnt1 = ny2pos - ny1pos;
nypos = ny1pos;
do {
@@ -156,7 +156,7 @@
do {
*ptr++ = thispix;
} while (--cnt2 >= 0);
-
+
nypos++;
} while (--cnt1 >= 0);
}
@@ -342,7 +342,7 @@
case 7:
G.bdebug_messages = val;
if (G.bdebug_messages)
- G.logfile_fd = xfopen("/tmp/fbsplash.log", "w");
+ G.logfile_fd = xfopen("/tmp/fbsplash.log", "w");
break;
#endif
err:
Modified: trunk/busybox/miscutils/man.c
===================================================================
--- trunk/busybox/miscutils/man.c 2008-04-22 00:08:27 UTC (rev 21793)
+++ trunk/busybox/miscutils/man.c 2008-04-22 00:16:29 UTC (rev 21794)
@@ -82,7 +82,7 @@
sec_list = xstrdup("1:2:3:4:5:6:7:8:9");
alloc_mp = 10;
- man_path_list = xmalloc(10 * sizeof(man_path_list[0]));
+ man_path_list = xmalloc(10 * sizeof(man_path_list[0]));
count_mp = 0;
man_path_list[0] = xstrdup(getenv("MANPATH"));
if (man_path_list[0])
@@ -137,8 +137,8 @@
char *man_filename = xasprintf("%.*s/man%.*s/%s.%.*s" ".bz2",
path_len, cur_path,
- sect_len, cur_sect,
- *argv,
+ sect_len, cur_sect,
+ *argv,
sect_len, cur_sect);
int found = show_manpage(pager, man_filename);
free(man_filename);
Modified: trunk/busybox/util-linux/Config.in
===================================================================
--- trunk/busybox/util-linux/Config.in 2008-04-22 00:08:27 UTC (rev 21793)
+++ trunk/busybox/util-linux/Config.in 2008-04-22 00:16:29 UTC (rev 21794)
@@ -532,7 +532,7 @@
### depends on VOLUMEID
### help
### TODO
-###
+###
### config FEATURE_VOLUMEID_MSDOS
### bool "msdos filesystem"
### default n
Modified: trunk/busybox/util-linux/mdev.c
===================================================================
--- trunk/busybox/util-linux/mdev.c 2008-04-22 00:08:27 UTC (rev 21793)
+++ trunk/busybox/util-linux/mdev.c 2008-04-22 00:16:29 UTC (rev 21794)
@@ -171,7 +171,7 @@
s = val;
while (*s && *s++ == '%')
n++;
-
+
p = alias = xzalloc(strlen(val) + n * strlen(device_name));
s = val + 1;
while (*s) {
More information about the busybox-cvs
mailing list