diff options
author | Denis Vlasenko <vda.linux@googlemail.com> | 2008-04-22 00:16:29 +0000 |
---|---|---|
committer | Denis Vlasenko <vda.linux@googlemail.com> | 2008-04-22 00:16:29 +0000 |
commit | 1f228985b27602f94ff973d50e276220887df6a3 (patch) | |
tree | 5715edba638603b3815dc8700c88c2c0395b2b16 | |
parent | 5d89fbaa2e00a8a26e530306d76b78bf91d12ec8 (diff) | |
download | busybox-w32-1f228985b27602f94ff973d50e276220887df6a3.tar.gz busybox-w32-1f228985b27602f94ff973d50e276220887df6a3.tar.bz2 busybox-w32-1f228985b27602f94ff973d50e276220887df6a3.zip |
whitespace fixes. no code changes
-rw-r--r-- | console-tools/openvt.c | 6 | ||||
-rw-r--r-- | coreutils/mv.c | 2 | ||||
-rw-r--r-- | debianutils/start_stop_daemon.c | 22 | ||||
-rw-r--r-- | include/applets.h | 2 | ||||
-rw-r--r-- | include/usage.h | 2 | ||||
-rw-r--r-- | miscutils/fbsplash.c | 16 | ||||
-rw-r--r-- | miscutils/man.c | 6 | ||||
-rw-r--r-- | util-linux/Config.in | 2 | ||||
-rw-r--r-- | util-linux/mdev.c | 2 |
9 files changed, 30 insertions, 30 deletions
diff --git a/console-tools/openvt.c b/console-tools/openvt.c index 3bb0a9210..c4746dfd3 100644 --- a/console-tools/openvt.c +++ b/console-tools/openvt.c | |||
@@ -60,7 +60,7 @@ static int get_vt_fd(void) | |||
60 | /* Do we, by chance, already have it? */ | 60 | /* Do we, by chance, already have it? */ |
61 | for (fd = 0; fd < 3; fd++) | 61 | for (fd = 0; fd < 3; fd++) |
62 | if (!not_vt_fd(fd)) | 62 | if (!not_vt_fd(fd)) |
63 | return fd; | 63 | return fd; |
64 | /* _only_ O_NONBLOCK: ask for neither read not write perms */ | 64 | /* _only_ O_NONBLOCK: ask for neither read not write perms */ |
65 | fd = open(DEV_CONSOLE, O_NONBLOCK); | 65 | fd = open(DEV_CONSOLE, O_NONBLOCK); |
66 | if (fd >= 0 && !not_vt_fd(fd)) | 66 | if (fd >= 0 && !not_vt_fd(fd)) |
@@ -73,7 +73,7 @@ static int find_free_vtno(void) | |||
73 | int vtno; | 73 | int vtno; |
74 | int fd = get_vt_fd(); | 74 | int fd = get_vt_fd(); |
75 | 75 | ||
76 | errno = 0; | 76 | errno = 0; |
77 | /*xfunc_error_retval = 3; - do we need compat? */ | 77 | /*xfunc_error_retval = 3; - do we need compat? */ |
78 | if (ioctl(fd, VT_OPENQRY, &vtno) != 0 || vtno <= 0) | 78 | if (ioctl(fd, VT_OPENQRY, &vtno) != 0 || vtno <= 0) |
79 | bb_perror_msg_and_die("can't find open VT"); | 79 | bb_perror_msg_and_die("can't find open VT"); |
@@ -138,7 +138,7 @@ int openvt_main(int argc ATTRIBUTE_UNUSED, char **argv) | |||
138 | close(0); | 138 | close(0); |
139 | /*setsid(); - BAD IDEA: after we exit, child is SIGHUPed... */ | 139 | /*setsid(); - BAD IDEA: after we exit, child is SIGHUPed... */ |
140 | xopen(vtname, O_RDWR); | 140 | xopen(vtname, O_RDWR); |
141 | xioctl(0, VT_GETSTATE, &vtstat); | 141 | xioctl(0, VT_GETSTATE, &vtstat); |
142 | 142 | ||
143 | if (flags & OPT_s) { | 143 | if (flags & OPT_s) { |
144 | xioctl(0, VT_ACTIVATE, (void*)(ptrdiff_t)vtno); | 144 | xioctl(0, VT_ACTIVATE, (void*)(ptrdiff_t)vtno); |
diff --git a/coreutils/mv.c b/coreutils/mv.c index 613d4ac46..5611ecd01 100644 --- a/coreutils/mv.c +++ b/coreutils/mv.c | |||
@@ -109,7 +109,7 @@ int mv_main(int argc, char **argv) | |||
109 | goto RET_1; | 109 | goto RET_1; |
110 | } | 110 | } |
111 | } | 111 | } |
112 | /* FILEUTILS_RECUR also prevents nasties like | 112 | /* FILEUTILS_RECUR also prevents nasties like |
113 | * "read from device and write contents to dst" | 113 | * "read from device and write contents to dst" |
114 | * instead of "create same device node" */ | 114 | * instead of "create same device node" */ |
115 | copy_flag = FILEUTILS_RECUR | FILEUTILS_PRESERVE_STATUS; | 115 | copy_flag = FILEUTILS_RECUR | FILEUTILS_PRESERVE_STATUS; |
diff --git a/debianutils/start_stop_daemon.c b/debianutils/start_stop_daemon.c index 7a0d1166f..4e816bd19 100644 --- a/debianutils/start_stop_daemon.c +++ b/debianutils/start_stop_daemon.c | |||
@@ -142,18 +142,18 @@ static void do_procinit(void) | |||
142 | procdir = xopendir("/proc"); | 142 | procdir = xopendir("/proc"); |
143 | 143 | ||
144 | pid = 0; | 144 | pid = 0; |
145 | while(1) { | 145 | while(1) { |
146 | errno = 0; /* clear any previous error */ | 146 | errno = 0; /* clear any previous error */ |
147 | entry = readdir(procdir); | 147 | entry = readdir(procdir); |
148 | // TODO: check for exact errno(s) which mean that we got stale entry | 148 | // TODO: check for exact errno(s) which mean that we got stale entry |
149 | if (errno) /* Stale entry, process has died after opendir */ | 149 | if (errno) /* Stale entry, process has died after opendir */ |
150 | continue; | 150 | continue; |
151 | if (!entry) /* EOF, no more entries */ | 151 | if (!entry) /* EOF, no more entries */ |
152 | break; | 152 | break; |
153 | pid = bb_strtou(entry->d_name, NULL, 10); | 153 | pid = bb_strtou(entry->d_name, NULL, 10); |
154 | if (errno) /* NaN */ | 154 | if (errno) /* NaN */ |
155 | continue; | 155 | continue; |
156 | check(pid); | 156 | check(pid); |
157 | } | 157 | } |
158 | closedir(procdir); | 158 | closedir(procdir); |
159 | if (!pid) | 159 | if (!pid) |
diff --git a/include/applets.h b/include/applets.h index af5359784..27c3a1b6f 100644 --- a/include/applets.h +++ b/include/applets.h | |||
@@ -231,7 +231,7 @@ USE_LSATTR(APPLET(lsattr, _BB_DIR_BIN, _BB_SUID_NEVER)) | |||
231 | USE_LSMOD(APPLET(lsmod, _BB_DIR_SBIN, _BB_SUID_NEVER)) | 231 | USE_LSMOD(APPLET(lsmod, _BB_DIR_SBIN, _BB_SUID_NEVER)) |
232 | USE_UNLZMA(APPLET_ODDNAME(lzmacat, unlzma, _BB_DIR_USR_BIN, _BB_SUID_NEVER, lzmacat)) | 232 | USE_UNLZMA(APPLET_ODDNAME(lzmacat, unlzma, _BB_DIR_USR_BIN, _BB_SUID_NEVER, lzmacat)) |
233 | USE_MAKEDEVS(APPLET(makedevs, _BB_DIR_SBIN, _BB_SUID_NEVER)) | 233 | USE_MAKEDEVS(APPLET(makedevs, _BB_DIR_SBIN, _BB_SUID_NEVER)) |
234 | USE_MAN(APPLET(man, _BB_DIR_SBIN, _BB_SUID_NEVER)) | 234 | USE_MAN(APPLET(man, _BB_DIR_SBIN, _BB_SUID_NEVER)) |
235 | USE_MATCHPATHCON(APPLET(matchpathcon, _BB_DIR_USR_SBIN, _BB_SUID_NEVER)) | 235 | USE_MATCHPATHCON(APPLET(matchpathcon, _BB_DIR_USR_SBIN, _BB_SUID_NEVER)) |
236 | USE_MD5SUM(APPLET_ODDNAME(md5sum, md5_sha1_sum, _BB_DIR_USR_BIN, _BB_SUID_NEVER, md5sum)) | 236 | USE_MD5SUM(APPLET_ODDNAME(md5sum, md5_sha1_sum, _BB_DIR_USR_BIN, _BB_SUID_NEVER, md5sum)) |
237 | USE_MDEV(APPLET(mdev, _BB_DIR_SBIN, _BB_SUID_NEVER)) | 237 | USE_MDEV(APPLET(mdev, _BB_DIR_SBIN, _BB_SUID_NEVER)) |
diff --git a/include/usage.h b/include/usage.h index 01acda16d..acc72d158 100644 --- a/include/usage.h +++ b/include/usage.h | |||
@@ -521,7 +521,7 @@ | |||
521 | 521 | ||
522 | #define cpio_trivial_usage \ | 522 | #define cpio_trivial_usage \ |
523 | "-[dim" USE_FEATURE_CPIO_O("o") "tuv][F cpiofile]" \ | 523 | "-[dim" USE_FEATURE_CPIO_O("o") "tuv][F cpiofile]" \ |
524 | USE_FEATURE_CPIO_O( "[H newc]" ) | 524 | USE_FEATURE_CPIO_O( "[H newc]" ) |
525 | #define cpio_full_usage "\n\n" \ | 525 | #define cpio_full_usage "\n\n" \ |
526 | "Extract or list files from a cpio archive" \ | 526 | "Extract or list files from a cpio archive" \ |
527 | USE_FEATURE_CPIO_O( ", or create a cpio archive" ) \ | 527 | USE_FEATURE_CPIO_O( ", or create a cpio archive" ) \ |
diff --git a/miscutils/fbsplash.c b/miscutils/fbsplash.c index a288b3ca5..626cefb28 100644 --- a/miscutils/fbsplash.c +++ b/miscutils/fbsplash.c | |||
@@ -9,11 +9,11 @@ | |||
9 | * - use kernel option 'vga=xxx' or otherwise enable framebuffer device. | 9 | * - use kernel option 'vga=xxx' or otherwise enable framebuffer device. |
10 | * - put somewhere fbsplash.cfg file and an image in .ppm format. | 10 | * - put somewhere fbsplash.cfg file and an image in .ppm format. |
11 | * - run applet: $ setsid fbsplash [params] & | 11 | * - run applet: $ setsid fbsplash [params] & |
12 | * -c: hide cursor | 12 | * -c: hide cursor |
13 | * -d /dev/fbN: framebuffer device (if not /dev/fb0) | 13 | * -d /dev/fbN: framebuffer device (if not /dev/fb0) |
14 | * -s path_to_image_file (can be "-" for stdin) | 14 | * -s path_to_image_file (can be "-" for stdin) |
15 | * -i path_to_cfg_file | 15 | * -i path_to_cfg_file |
16 | * -f path_to_fifo (can be "-" for stdin) | 16 | * -f path_to_fifo (can be "-" for stdin) |
17 | * - if you want to run it only in presence of a kernel parameter | 17 | * - if you want to run it only in presence of a kernel parameter |
18 | * (for example fbsplash=on), use: | 18 | * (for example fbsplash=on), use: |
19 | * grep -q "fbsplash=on" </proc/cmdline && setsid fbsplash [params] | 19 | * grep -q "fbsplash=on" </proc/cmdline && setsid fbsplash [params] |
@@ -147,7 +147,7 @@ static void fb_drawfullrectangle(int nx1pos, int ny1pos, int nx2pos, int ny2pos, | |||
147 | ngreen >>= 2; // 6-bit green | 147 | ngreen >>= 2; // 6-bit green |
148 | nblue >>= 3; // 5-bit blue | 148 | nblue >>= 3; // 5-bit blue |
149 | thispix = nblue + (ngreen << 5) + (nred << (5+6)); | 149 | thispix = nblue + (ngreen << 5) + (nred << (5+6)); |
150 | 150 | ||
151 | cnt1 = ny2pos - ny1pos; | 151 | cnt1 = ny2pos - ny1pos; |
152 | nypos = ny1pos; | 152 | nypos = ny1pos; |
153 | do { | 153 | do { |
@@ -156,7 +156,7 @@ static void fb_drawfullrectangle(int nx1pos, int ny1pos, int nx2pos, int ny2pos, | |||
156 | do { | 156 | do { |
157 | *ptr++ = thispix; | 157 | *ptr++ = thispix; |
158 | } while (--cnt2 >= 0); | 158 | } while (--cnt2 >= 0); |
159 | 159 | ||
160 | nypos++; | 160 | nypos++; |
161 | } while (--cnt1 >= 0); | 161 | } while (--cnt1 >= 0); |
162 | } | 162 | } |
@@ -342,7 +342,7 @@ static void init(const char *cfg_filename) | |||
342 | case 7: | 342 | case 7: |
343 | G.bdebug_messages = val; | 343 | G.bdebug_messages = val; |
344 | if (G.bdebug_messages) | 344 | if (G.bdebug_messages) |
345 | G.logfile_fd = xfopen("/tmp/fbsplash.log", "w"); | 345 | G.logfile_fd = xfopen("/tmp/fbsplash.log", "w"); |
346 | break; | 346 | break; |
347 | #endif | 347 | #endif |
348 | err: | 348 | err: |
diff --git a/miscutils/man.c b/miscutils/man.c index bf13ab527..278e5a336 100644 --- a/miscutils/man.c +++ b/miscutils/man.c | |||
@@ -82,7 +82,7 @@ int man_main(int argc ATTRIBUTE_UNUSED, char **argv) | |||
82 | 82 | ||
83 | sec_list = xstrdup("1:2:3:4:5:6:7:8:9"); | 83 | sec_list = xstrdup("1:2:3:4:5:6:7:8:9"); |
84 | alloc_mp = 10; | 84 | alloc_mp = 10; |
85 | man_path_list = xmalloc(10 * sizeof(man_path_list[0])); | 85 | man_path_list = xmalloc(10 * sizeof(man_path_list[0])); |
86 | count_mp = 0; | 86 | count_mp = 0; |
87 | man_path_list[0] = xstrdup(getenv("MANPATH")); | 87 | man_path_list[0] = xstrdup(getenv("MANPATH")); |
88 | if (man_path_list[0]) | 88 | if (man_path_list[0]) |
@@ -137,8 +137,8 @@ int man_main(int argc ATTRIBUTE_UNUSED, char **argv) | |||
137 | 137 | ||
138 | char *man_filename = xasprintf("%.*s/man%.*s/%s.%.*s" ".bz2", | 138 | char *man_filename = xasprintf("%.*s/man%.*s/%s.%.*s" ".bz2", |
139 | path_len, cur_path, | 139 | path_len, cur_path, |
140 | sect_len, cur_sect, | 140 | sect_len, cur_sect, |
141 | *argv, | 141 | *argv, |
142 | sect_len, cur_sect); | 142 | sect_len, cur_sect); |
143 | int found = show_manpage(pager, man_filename); | 143 | int found = show_manpage(pager, man_filename); |
144 | free(man_filename); | 144 | free(man_filename); |
diff --git a/util-linux/Config.in b/util-linux/Config.in index 8b5bf751c..c30091a7a 100644 --- a/util-linux/Config.in +++ b/util-linux/Config.in | |||
@@ -532,7 +532,7 @@ config FEATURE_VOLUMEID_SYSV | |||
532 | ### depends on VOLUMEID | 532 | ### depends on VOLUMEID |
533 | ### help | 533 | ### help |
534 | ### TODO | 534 | ### TODO |
535 | ### | 535 | ### |
536 | ### config FEATURE_VOLUMEID_MSDOS | 536 | ### config FEATURE_VOLUMEID_MSDOS |
537 | ### bool "msdos filesystem" | 537 | ### bool "msdos filesystem" |
538 | ### default n | 538 | ### default n |
diff --git a/util-linux/mdev.c b/util-linux/mdev.c index 9d77f6a1f..9d37b6c90 100644 --- a/util-linux/mdev.c +++ b/util-linux/mdev.c | |||
@@ -171,7 +171,7 @@ static void make_device(char *path, int delete) | |||
171 | s = val; | 171 | s = val; |
172 | while (*s && *s++ == '%') | 172 | while (*s && *s++ == '%') |
173 | n++; | 173 | n++; |
174 | 174 | ||
175 | p = alias = xzalloc(strlen(val) + n * strlen(device_name)); | 175 | p = alias = xzalloc(strlen(val) + n * strlen(device_name)); |
176 | s = val + 1; | 176 | s = val + 1; |
177 | while (*s) { | 177 | while (*s) { |