Remove trailing whitespace. Update copyright to include 2004.

author: Eric Andersen <andersen@codepoet.org> 2004-03-15 08:29:22 +0000
committer: Eric Andersen <andersen@codepoet.org> 2004-03-15 08:29:22 +0000
commit: c7bda1ce659294d6e22c06e087f6f265983c7578 (patch)
tree: 4c6d2217f4d8306c59cf1096f8664e1cfd167213 /util-linux
parent: 8854004b41065b3d081af7f3df13a100b0c8bfbe (diff)
download: busybox-w32-c7bda1ce659294d6e22c06e087f6f265983c7578.tar.gz
busybox-w32-c7bda1ce659294d6e22c06e087f6f265983c7578.tar.bz2
busybox-w32-c7bda1ce659294d6e22c06e087f6f265983c7578.zip
16 files changed, 70 insertions, 71 deletions
diff --git a/util-linux/Config.in b/util-linux/Config.in
index 2bb9c09cc..c97e5c436 100644
--- a/util-linux/Config.in
+++ b/util-linux/Config.in
@@ -71,7 +71,7 @@ config CONFIG_FDISK
        help
          The fdisk utility is used to divide hard disks into one or more
          logical disks, which are generally called partitions.  This utility
-          can be used to list and edit the set of partitions or BSD style 
+          can be used to list and edit the set of partitions or BSD style
          'disk slices' that are defined on a hard drive.
 if !CONFIG_LFS
@@ -84,7 +84,7 @@ config FDISK_SUPPORT_LARGE_DISKS
 endif
 config CONFIG_FEATURE_FDISK_WRITABLE
-        bool "  Write support" 
+        bool "  Write support"
        default y
        depends on CONFIG_FDISK
        help
@@ -95,7 +95,7 @@ config CONFIG_FEATURE_FDISK_WRITABLE
 config CONFIG_FEATURE_AIX_LABEL
        bool "  Support AIX disklabels"
        default n
-        depends on CONFIG_FDISK && CONFIG_FEATURE_FDISK_WRITABLE  
+        depends on CONFIG_FDISK && CONFIG_FEATURE_FDISK_WRITABLE
        help
          Enabling this option allows you to create or change AIX disklabels.
          Most people can safely leave this option disabled.
@@ -111,7 +111,7 @@ config CONFIG_FEATURE_SGI_LABEL
 config CONFIG_FEATURE_SUN_LABEL
        bool "  Support SUN disklabels"
        default n
-        depends on CONFIG_FDISK && CONFIG_FEATURE_FDISK_WRITABLE        
+        depends on CONFIG_FDISK && CONFIG_FEATURE_FDISK_WRITABLE
        help
          Enabling this option allows you to create or change SUN disklabels.
          Most people can safely leave this option disabled.
@@ -267,7 +267,7 @@ config CONFIG_RDATE
        bool "rdate"
        default n
        help
-          The rdate utility allows you to synchronize the date and time of your 
+          The rdate utility allows you to synchronize the date and time of your
          system clock with the date and time of a remote networked system using
          the RFC868 protocol, which is built into the inetd daemon on most
          systems.
diff --git a/util-linux/Makefile b/util-linux/Makefile
index d2e496231..f2e2021f0 100644
--- a/util-linux/Makefile
+++ b/util-linux/Makefile
@@ -1,6 +1,6 @@
 # Makefile for busybox
 #
-# Copyright (C) 1999-2003 by Erik Andersen <andersen@codepoet.org>
+# Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/util-linux/Makefile.in b/util-linux/Makefile.in
index 8cd5f1bd0..f56d57464 100644
--- a/util-linux/Makefile.in
+++ b/util-linux/Makefile.in
@@ -1,6 +1,6 @@
 # Makefile for busybox
 #
-# Copyright (C) 1999-2003 by Erik Andersen <andersen@codepoet.org>
+# Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/util-linux/dmesg.c b/util-linux/dmesg.c
index b7d17840f..2ca882714 100644
--- a/util-linux/dmesg.c
+++ b/util-linux/dmesg.c
@@ -10,8 +10,8 @@
 * 1999-02-22 Arkadiusz Mi�kiewicz <misiek@misiek.eu.org>
 * - added Native Language Support
 *
- * from util-linux -- adapted for busybox by 
+ * from util-linux -- adapted for busybox by
- * Erik Andersen <andersen@codepoet.org>. I ripped out Native Language 
+ * Erik Andersen <andersen@codepoet.org>. I ripped out Native Language
 * Support, replaced getopt, added some gotos for redundant stuff.
 *
 * Audited and cleaned up on 7 March 2003 to reduce size of
diff --git a/util-linux/fbset.c b/util-linux/fbset.c
index b5f57b1e4..83bf309a3 100644
--- a/util-linux/fbset.c
+++ b/util-linux/fbset.c
@@ -20,7 +20,7 @@
 *
 * This is a from-scratch implementation of fbset; but the de facto fbset
 * implementation was a good reference. fbset (original) is released under
- * the GPL, and is (c) 1995-1999 by: 
+ * the GPL, and is (c) 1995-1999 by:
 *     Geert Uytterhoeven (Geert.Uytterhoeven@cs.kuleuven.ac.be)
 */
@@ -89,8 +89,8 @@ static const int FBIOPUT_VSCREENINFO = 0x4601;
 struct fb_bitfield {
        uint32_t offset;                        /* beginning of bitfield        */
        uint32_t length;                        /* length of bitfield           */
-        uint32_t msb_right;             /* != 0 : Most significant bit is */ 
+        uint32_t msb_right;             /* != 0 : Most significant bit is */
-                                        /* right */ 
+                                        /* right */
 };
 struct fb_var_screeninfo {
        uint32_t xres;                  /* visible resolution           */
@@ -106,7 +106,7 @@ struct fb_var_screeninfo {
        struct fb_bitfield red;         /* bitfield in fb mem if true color, */
        struct fb_bitfield green;       /* else only length is significant */
        struct fb_bitfield blue;
-        struct fb_bitfield transp;      /* transparency                 */      
+        struct fb_bitfield transp;      /* transparency                 */
        uint32_t nonstd;                        /* != 0 Non standard pixel format */
@@ -210,13 +210,13 @@ static int readmode(struct fb_var_screeninfo *base, const char *fn,
                    if ((p = strstr(buf, "geometry "))) {
                        p += 9;
-                        sscanf(p, "%d %d %d %d %d", 
+                        sscanf(p, "%d %d %d %d %d",
-                                &(base->xres), &(base->yres), 
+                                &(base->xres), &(base->yres),
-                                &(base->xres_virtual), &(base->yres_virtual), 
+                                &(base->xres_virtual), &(base->yres_virtual),
                                &(base->bits_per_pixel));
                    } else if ((p = strstr(buf, "timings "))) {
                        p += 8;
-                        
+    
                        sscanf(p, "%d %d %d %d %d %d %d",
                                &(base->pixclock),
                                &(base->left_margin), &(base->right_margin),
@@ -271,7 +271,7 @@ static int readmode(struct fb_var_screeninfo *base, const char *fn,
                            base->sync |= FB_SYNC_EXT;
                        }
                    }
-                    
                                        if (strstr(buf, "endmode"))
                                                return 1;
                                }
diff --git a/util-linux/fdisk.c b/util-linux/fdisk.c
index 2374960df..f35aeb9f3 100644
--- a/util-linux/fdisk.c
+++ b/util-linux/fdisk.c
@@ -52,7 +52,7 @@
 #define BLKSSZGET  _IO(0x12,104)   /* get block device sector size */
 /* Avoid conflicts with the 2.6 kernel headers, which define
- * _IOR rather differently */ 
+ * _IOR rather differently */
 #undef _IOR
 #define _IOR(type,nr,size)      _IOC(_IOC_READ,(type),(nr),sizeof(size))
 #define BLKGETSIZE64 _IOR(0x12,114,uint64_t)
@@ -4279,7 +4279,7 @@ read_int(uint low, uint dflt, uint high, uint base, char *mesg)
                       while (isdigit(*++line_ptr))
                               use_default = 0;
-            
+        
                       switch (*line_ptr) {
                               case 'c':
                               case 'C':
diff --git a/util-linux/freeramdisk.c b/util-linux/freeramdisk.c
index 38267e61e..e5061dc34 100644
--- a/util-linux/freeramdisk.c
+++ b/util-linux/freeramdisk.c
@@ -45,7 +45,7 @@ freeramdisk_main(int argc, char **argv)
        }
        fd = bb_xopen(argv[1], O_RDWR);
-        
        result = ioctl(fd, BLKFLSBUF);
 #ifdef CONFIG_FEATURE_CLEAN_UP
        close(fd);
diff --git a/util-linux/fsck_minix.c b/util-linux/fsck_minix.c
index 4d07e028f..709a2a143 100644
--- a/util-linux/fsck_minix.c
+++ b/util-linux/fsck_minix.c
@@ -49,7 +49,7 @@
 * 01.07.96  - Fixed the v2 fs stuff to use the right #defines and such
 *             for modern libcs (janl@math.uio.no, Nicolai Langfeldt)
 *
- * 02.07.96  - Added C bit fiddling routines from rmk@ecs.soton.ac.uk 
+ * 02.07.96  - Added C bit fiddling routines from rmk@ecs.soton.ac.uk
 *             (Russell King).  He made them for ARM.  It would seem
 *             that the ARM is powerful enough to do this in C whereas
 *             i386 and m64k must use assembly to get it fast >:-)
@@ -57,7 +57,7 @@
 *             (janl@math.uio.no, Nicolai Langfeldt)
 *
 * 04.11.96  - Added minor fixes from Andreas Schwab to avoid compiler
- *             warnings.  Added mc68k bitops from 
+ *             warnings.  Added mc68k bitops from
 *             Joerg Dorchain <dorchain@mpi-sb.mpg.de>.
 *
 * 06.11.96  - Added v2 code submitted by Joerg Dorchain, but written by
@@ -83,7 +83,7 @@
 *      -f force filesystem check even if filesystem marked as valid
 *
 * The device may be a block device or a image of one, but this isn't
- * enforced (but it's not much fun on a character device :-). 
+ * enforced (but it's not much fun on a character device :-).
 */
 #include <stdio.h>
@@ -1312,7 +1312,7 @@ static void free_name_list(void)
 {
        int i;
-        if (name_list) { 
+        if (name_list) {
                for (i = 0; i < MAX_DEPTH; i++) {
                        free(name_list[i]);
                }
@@ -1396,7 +1396,7 @@ extern int fsck_minix_main(int argc, char **argv)
        /*
         * Determine whether or not we should continue with the checking.
         * This is based on the status of the filesystem valid and error
-         * flags and whether or not the -f switch was specified on the 
+         * flags and whether or not the -f switch was specified on the
         * command line.
         */
        printf("%s, %s\n", bb_applet_name, program_version);
diff --git a/util-linux/hwclock.c b/util-linux/hwclock.c
index e089b1d81..fae511f9c 100644
--- a/util-linux/hwclock.c
+++ b/util-linux/hwclock.c
@@ -46,7 +46,7 @@ struct linux_rtc_time {
        int tm_yday;
        int tm_isdst;
 };
-                                    
+                
 #define RTC_SET_TIME   _IOW('p', 0x0a, struct linux_rtc_time) /* Set RTC time    */
 #define RTC_RD_TIME    _IOR('p', 0x09, struct linux_rtc_time) /* Read RTC time   */
@@ -71,17 +71,17 @@ static time_t read_rtc(int utc)
        if ( ioctl ( rtc, RTC_RD_TIME, &tm ) < 0 )
                bb_perror_msg_and_die ( "Could not read time from RTC" );
        tm. tm_isdst = -1; // not known
-        
        close ( rtc );
-        if ( utc ) {    
+        if ( utc ) {
                oldtz = getenv ( "TZ" );
                setenv ( "TZ", "UTC 0", 1 );
                tzset ( );
        }
-        
        t = mktime ( &tm );
-        
        if ( utc ) {
                if ( oldtz )
                        setenv ( "TZ", oldtz, 1 );
@@ -101,13 +101,13 @@ static void write_rtc(time_t t, int utc)
                if (( rtc = open ( "/dev/misc/rtc", O_WRONLY )) < 0 )
                        bb_perror_msg_and_die ( "Could not access RTC" );
        }
-        
        tm = *( utc ? gmtime ( &t ) : localtime ( &t ));
        tm. tm_isdst = 0;
-        
        if ( ioctl ( rtc, RTC_SET_TIME, &tm ) < 0 )
                bb_perror_msg_and_die ( "Could not set the RTC time" );
-        
        close ( rtc );
 }
@@ -117,16 +117,16 @@ static int show_clock(int utc)
        time_t t;
        char buffer [64];
-        t = read_rtc ( utc );           
+        t = read_rtc ( utc );
        ptm = localtime ( &t );  /* Sets 'tzname[]' */
-        
        safe_strncpy ( buffer, ctime ( &t ), sizeof( buffer ));
        if ( buffer [0] )
                buffer [bb_strlen ( buffer ) - 1] = 0;
-        
        //printf ( "%s  %.6f seconds %s\n", buffer, 0.0, utc ? "" : ( ptm-> tm_isdst ? tzname [1] : tzname [0] ));
        printf ( "%s  %.6f seconds\n", buffer, 0.0 );
-        
        return 0;
 }
@@ -134,7 +134,7 @@ static int to_sys_clock(int utc)
 {
        struct timeval tv = { 0, 0 };
        const struct timezone tz = { timezone/60 - 60*daylight, 0 };
-        
        tv. tv_sec = read_rtc ( utc );
        if ( settimeofday ( &tv, &tz ))
@@ -160,18 +160,18 @@ static int check_utc(void)
 {
        int utc = 0;
        FILE *f = fopen ( "/var/lib/hwclock/adjtime", "r" );
-        
        if ( f ) {
                char buffer [128];
-        
                while ( fgets ( buffer, sizeof( buffer ), f )) {
                        int len = bb_strlen ( buffer );
-                        
                        while ( len && isspace ( buffer [len - 1] ))
                                len--;
-                                
                        buffer [len] = 0;
-                
                        if ( strncmp ( buffer, "UTC", 3 ) == 0 ) {
                                utc = 1;
                                break;
@@ -224,6 +224,6 @@ static const struct option hwclock_long_options[] = {
                return from_sys_clock ( utc );
        } else {
                /* default HWCLOCK_OPT_SHOW */
-                return show_clock ( utc );      
+                return show_clock ( utc );
        }
 }
diff --git a/util-linux/mkfs_minix.c b/util-linux/mkfs_minix.c
index 0f72b3592..3c140ef2a 100644
--- a/util-linux/mkfs_minix.c
+++ b/util-linux/mkfs_minix.c
@@ -35,7 +35,7 @@
 *
 * 30.10.94 - added support for v2 filesystem
 *            (Andreas Schwab, schwab@issan.informatik.uni-dortmund.de)
- * 
+ *
 * 09.11.94  -  Added test to prevent overwrite of mounted fs adapted
 *              from Theodore Ts'o's (tytso@athena.mit.edu) mke2fs
 *              program.  (Daniel Quinlan, quinlan@yggdrasil.com)
@@ -56,7 +56,7 @@
 *      -v for v2 filesystem
 *
 * The device may be a block device or a image of one, but this isn't
- * enforced (but it's not much fun on a character device :-). 
+ * enforced (but it's not much fun on a character device :-).
 *
 * Modified for BusyBox by Erik Andersen <andersen@debian.org> --
 *      removed getopt based parser and added a hand rolled one.
@@ -702,7 +702,7 @@ extern int mkfs_minix_main(int argc, char **argv)
        if (INODE_SIZE2 * MINIX2_INODES_PER_BLOCK != BLOCK_SIZE)
                bb_error_msg_and_die("bad inode size");
 #endif
-        
        /* Parse options */
        argv++;
        while (--argc >= 0 && *argv && **argv) {
@@ -755,7 +755,7 @@ extern int mkfs_minix_main(int argc, char **argv)
                                                                magic = MINIX_SUPER_MAGIC;
                                                        else if (i == 30)
                                                                magic = MINIX_SUPER_MAGIC2;
-                                                        else 
+                                                        else
                                                                bb_show_usage();
                                                        namelen = i;
                                                        dirsize = i + 2;
diff --git a/util-linux/more.c b/util-linux/more.c
index e3a1d8656..d7b7ce22f 100644
--- a/util-linux/more.c
+++ b/util-linux/more.c
@@ -3,10 +3,10 @@
 * Mini more implementation for busybox
 *
 * Copyright (C) 1995, 1996 by Bruce Perens <bruce@pixar.com>.
- * Copyright (C) 1999-2003 by Erik Andersen <andersen@codepoet.org>
+ * Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org>
 *
 * Latest version blended together by Erik Andersen <andersen@codepoet.org>,
- * based on the original more implementation by Bruce, and code from the 
+ * based on the original more implementation by Bruce, and code from the
 * Debian boot-floppies team.
 *
 * Termios corrects by Vladimir Oleynik <dzo@simtreas.ru>
@@ -101,7 +101,7 @@ extern int more_main(int argc, char **argv)
                        file = bb_wfopen(*argv, "r");
                if(file==0)
                        goto loop;
-                        
                st.st_size = 0;
                fstat(fileno(file), &st);
@@ -158,7 +158,7 @@ extern int more_main(int argc, char **argv)
                                        goto end;
                        }
-                        /* 
+                        /*
                         * There are two input streams to worry about here:
                         *
                         * c     : the character we are reading from the file being "mored"
diff --git a/util-linux/mount.c b/util-linux/mount.c
index 8a1f4a11a..098e63663 100644
--- a/util-linux/mount.c
+++ b/util-linux/mount.c
@@ -3,7 +3,7 @@
 * Mini mount implementation for busybox
 *
 * Copyright (C) 1995, 1996 by Bruce Perens <bruce@pixar.com>.
- * Copyright (C) 1999-2003 by Erik Andersen <andersen@codepoet.org>
+ * Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org>
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -27,8 +27,8 @@
 *
 * 1999-10-07   Erik Andersen <andersen@codepoet.org>.
 *              Rewrite of a lot of code. Removed mtab usage (I plan on
- *              putting it back as a compile-time option some time), 
+ *              putting it back as a compile-time option some time),
- *              major adjustments to option parsing, and some serious 
+ *              major adjustments to option parsing, and some serious
 *              dieting all around.
 *
 * 1999-11-06   mtab suppport is back - andersee
@@ -40,8 +40,8 @@
 *              Rewrote fstab while loop and lower mount section. Can now do
 *              single mounts from fstab. Can override fstab options for single
 *              mount. Common mount_one call for single mounts and 'all'. Fixed
- *              mtab updating and stale entries. Removed 'remount' default. 
+ *              mtab updating and stale entries. Removed 'remount' default.
- *      
+ *
 */
 #include <limits.h>
@@ -289,7 +289,7 @@ static int mount_one(char *blockDevice, char *directory, char *filesystemType,
                }
                if (read_proc && !status) {
-                        
                        f = bb_xfopen("/proc/filesystems", "r");
                        while (fgets(buf, sizeof(buf), f) != NULL) {
diff --git a/util-linux/nfsmount.c b/util-linux/nfsmount.c
index 4241f79f5..34f23f5aa 100644
--- a/util-linux/nfsmount.c
+++ b/util-linux/nfsmount.c
@@ -24,7 +24,7 @@
 *
 * 1999-02-22 Arkadiusz Mi�kiewicz <misiek@misiek.eu.org>
 * - added Native Language Support
- * 
+ *
 * Modified by Olaf Kirch and Trond Myklebust for new NFS code,
 * plus NFSv3 stuff.
 */
@@ -95,7 +95,7 @@ enum nfs_stat {
        NFSERR_BADTYPE = 10007,         /*    v3 */
        NFSERR_JUKEBOX = 10008          /*    v3 */
 };
- 
 #define NFS_PROGRAM     100003
@@ -445,7 +445,7 @@ int nfsmount(const char *spec, const char *node, int *flags,
        for (opt = strtok(old_opts, ","); opt; opt = strtok(NULL, ",")) {
                if ((opteq = strchr(opt, '='))) {
-                        val = atoi(opteq + 1);  
+                        val = atoi(opteq + 1);
                        *opteq = '\0';
                        if (!strcmp(opt, "rsize"))
                                data.rsize = val;
@@ -515,9 +515,9 @@ int nfsmount(const char *spec, const char *node, int *flags,
                                val = 0;
                                opt += 2;
                        }
-                        if (!strcmp(opt, "bg")) 
+                        if (!strcmp(opt, "bg"))
                                bg = val;
-                        else if (!strcmp(opt, "fg")) 
+                        else if (!strcmp(opt, "fg"))
                                bg = !val;
                        else if (!strcmp(opt, "soft"))
                                soft = val;
@@ -872,7 +872,7 @@ fail:
        if (fsock != -1)
                close(fsock);
        return retval;
-}       
+}
 /*
 * We need to translate between nfs status return values and
diff --git a/util-linux/pivot_root.c b/util-linux/pivot_root.c
index 39453a261..85e180c46 100644
--- a/util-linux/pivot_root.c
+++ b/util-linux/pivot_root.c
@@ -4,7 +4,7 @@
 *
 * busyboxed by Evin Robertson
 * pivot_root syscall stubbed by Erik Andersen, so it will compile
- *     regardless of the kernel being used. 
+ *     regardless of the kernel being used.
 */
 #include <stdlib.h>
 #include <stdio.h>
diff --git a/util-linux/swaponoff.c b/util-linux/swaponoff.c
index 9da70756e..7c7031bce 100644
--- a/util-linux/swaponoff.c
+++ b/util-linux/swaponoff.c
@@ -2,8 +2,7 @@
 /*
 * Mini swapon/swapoff implementation for busybox
 *
- * Copyright (C) 1999-2003 by Erik Andersen <andersen@codepoet.org>
+ * Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org>
- * Copyright (C) 1999-2003 by Erik Andersen <andersen@codepoet.org>
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
diff --git a/util-linux/umount.c b/util-linux/umount.c
index 5df597028..37a8f061e 100644
--- a/util-linux/umount.c
+++ b/util-linux/umount.c
@@ -2,7 +2,7 @@
 /*
 * Mini umount implementation for busybox
 *
- * Copyright (C) 1999-2003 by Erik Andersen <andersen@codepoet.org>
+ * Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org>
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -28,7 +28,7 @@
 #include <stdlib.h>
 #include "busybox.h"
-/* Teach libc5 about realpath -- it includes it but the 
+/* Teach libc5 about realpath -- it includes it but the
 * prototype is missing... */
 #if (__GLIBC__ <= 2) && (__GLIBC_MINOR__ < 1)
 extern char *realpath(const char *path, char *resolved_path);
@@ -148,7 +148,7 @@ static char *mtab_first(void **iter)
        return mtab_next(iter);
 }
-/* Don't bother to clean up, since exit() does that 
+/* Don't bother to clean up, since exit() does that
 * automagically, so we can save a few bytes */
 #ifdef CONFIG_FEATURE_CLEAN_UP
 static void mtab_free(void)
author	Eric Andersen <andersen@codepoet.org>	2004-03-15 08:29:22 +0000
committer	Eric Andersen <andersen@codepoet.org>	2004-03-15 08:29:22 +0000
commit	c7bda1ce659294d6e22c06e087f6f265983c7578 (patch)
tree	4c6d2217f4d8306c59cf1096f8664e1cfd167213 /util-linux
parent	8854004b41065b3d081af7f3df13a100b0c8bfbe (diff)
download	busybox-w32-c7bda1ce659294d6e22c06e087f6f265983c7578.tar.gz busybox-w32-c7bda1ce659294d6e22c06e087f6f265983c7578.tar.bz2 busybox-w32-c7bda1ce659294d6e22c06e087f6f265983c7578.zip