svn commit: trunk/busybox: archival archival/libunarchive console-t etc...
landley at busybox.net
landley at busybox.net
Sun Sep 11 01:05:33 UTC 2005
Author: landley
Date: 2005-09-10 18:05:30 -0700 (Sat, 10 Sep 2005)
New Revision: 11422
Log:
Cleanup patch by Bernhard Fischer, removing unnecessary includes of
getopt.h, whitespace changes, typos, etc.
Modified:
trunk/busybox/archival/ar.c
trunk/busybox/archival/bunzip2.c
trunk/busybox/archival/cpio.c
trunk/busybox/archival/dpkg_deb.c
trunk/busybox/archival/gunzip.c
trunk/busybox/archival/libunarchive/unpack_ar_archive.c
trunk/busybox/archival/uncompress.c
trunk/busybox/archival/unzip.c
trunk/busybox/console-tools/setconsole.c
trunk/busybox/coreutils/cut.c
trunk/busybox/coreutils/date.c
trunk/busybox/coreutils/dos2unix.c
trunk/busybox/coreutils/env.c
trunk/busybox/coreutils/install.c
trunk/busybox/coreutils/ls.c
trunk/busybox/coreutils/mkdir.c
trunk/busybox/coreutils/mv.c
trunk/busybox/coreutils/stat.c
trunk/busybox/coreutils/sum.c
trunk/busybox/coreutils/uudecode.c
trunk/busybox/coreutils/uuencode.c
trunk/busybox/debianutils/readlink.c
trunk/busybox/debianutils/start_stop_daemon.c
Changeset:
Modified: trunk/busybox/archival/ar.c
===================================================================
--- trunk/busybox/archival/ar.c 2005-09-10 04:10:18 UTC (rev 11421)
+++ trunk/busybox/archival/ar.c 2005-09-11 01:05:30 UTC (rev 11422)
@@ -27,7 +27,6 @@
*/
#include <fcntl.h>
-#include <getopt.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
Modified: trunk/busybox/archival/bunzip2.c
===================================================================
--- trunk/busybox/archival/bunzip2.c 2005-09-10 04:10:18 UTC (rev 11421)
+++ trunk/busybox/archival/bunzip2.c 2005-09-11 01:05:30 UTC (rev 11422)
@@ -6,7 +6,6 @@
*/
#include <fcntl.h>
-#include <getopt.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
@@ -35,7 +34,7 @@
src_fd = STDIN_FILENO;
filename = 0;
}
-
+
/* if called as bzcat force the stdout flag */
if ((opt & BUNZIP2_OPT_STDOUT) || bb_applet_name[2] == 'c')
filename = 0;
Modified: trunk/busybox/archival/cpio.c
===================================================================
--- trunk/busybox/archival/cpio.c 2005-09-10 04:10:18 UTC (rev 11421)
+++ trunk/busybox/archival/cpio.c 2005-09-11 01:05:30 UTC (rev 11422)
@@ -24,20 +24,19 @@
*
*/
#include <fcntl.h>
-#include <getopt.h>
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
#include "unarchive.h"
#include "busybox.h"
-#define CPIO_OPT_EXTRACT 0x01
-#define CPIO_OPT_TEST 0x02
-#define CPIO_OPT_UNCONDITIONAL 0x04
-#define CPIO_OPT_VERBOSE 0x08
-#define CPIO_OPT_FILE 0x10
+#define CPIO_OPT_EXTRACT 0x01
+#define CPIO_OPT_TEST 0x02
+#define CPIO_OPT_UNCONDITIONAL 0x04
+#define CPIO_OPT_VERBOSE 0x08
+#define CPIO_OPT_FILE 0x10
#define CPIO_OPT_CREATE_LEADING_DIR 0x20
-#define CPIO_OPT_PRESERVE_MTIME 0x40
+#define CPIO_OPT_PRESERVE_MTIME 0x40
extern int cpio_main(int argc, char **argv)
{
@@ -59,7 +58,7 @@
}
if (opt & CPIO_OPT_TEST) {
- /* if both extract and test option are given, ignore extract option */
+ /* if both extract and test options are given, ignore extract option */
if (opt & CPIO_OPT_EXTRACT) {
opt &= ~CPIO_OPT_EXTRACT;
}
@@ -79,7 +78,7 @@
archive_handle->action_header = header_list;
}
}
- if (cpio_filename) { /* CPIO_OPT_FILE */
+ if (cpio_filename) { /* CPIO_OPT_FILE */
archive_handle->src_fd = bb_xopen(cpio_filename, O_RDONLY);
archive_handle->seek = seek_by_jump;
}
Modified: trunk/busybox/archival/dpkg_deb.c
===================================================================
--- trunk/busybox/archival/dpkg_deb.c 2005-09-10 04:10:18 UTC (rev 11421)
+++ trunk/busybox/archival/dpkg_deb.c 2005-09-11 01:05:30 UTC (rev 11422)
@@ -18,7 +18,6 @@
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
-#include <getopt.h>
#include "unarchive.h"
#include "busybox.h"
Modified: trunk/busybox/archival/gunzip.c
===================================================================
--- trunk/busybox/archival/gunzip.c 2005-09-10 04:10:18 UTC (rev 11421)
+++ trunk/busybox/archival/gunzip.c 2005-09-11 01:05:30 UTC (rev 11422)
@@ -63,7 +63,6 @@
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
-#include <getopt.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
Modified: trunk/busybox/archival/libunarchive/unpack_ar_archive.c
===================================================================
--- trunk/busybox/archival/libunarchive/unpack_ar_archive.c 2005-09-10 04:10:18 UTC (rev 11421)
+++ trunk/busybox/archival/libunarchive/unpack_ar_archive.c 2005-09-11 01:05:30 UTC (rev 11422)
@@ -16,7 +16,6 @@
#include <fcntl.h>
#include <stdlib.h>
#include <string.h>
-#include <getopt.h>
#include "unarchive.h"
#include "busybox.h"
Modified: trunk/busybox/archival/uncompress.c
===================================================================
--- trunk/busybox/archival/uncompress.c 2005-09-10 04:10:18 UTC (rev 11421)
+++ trunk/busybox/archival/uncompress.c 2005-09-11 01:05:30 UTC (rev 11422)
@@ -20,7 +20,6 @@
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
-#include <getopt.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
Modified: trunk/busybox/archival/unzip.c
===================================================================
--- trunk/busybox/archival/unzip.c 2005-09-10 04:10:18 UTC (rev 11421)
+++ trunk/busybox/archival/unzip.c 2005-09-11 01:05:30 UTC (rev 11422)
@@ -38,7 +38,6 @@
*/
#include <fcntl.h>
-#include <getopt.h>
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
Modified: trunk/busybox/console-tools/setconsole.c
===================================================================
--- trunk/busybox/console-tools/setconsole.c 2005-09-10 04:10:18 UTC (rev 11421)
+++ trunk/busybox/console-tools/setconsole.c 2005-09-11 01:05:30 UTC (rev 11422)
@@ -24,7 +24,7 @@
#include <sys/types.h>
#include <fcntl.h>
#include <stdio.h>
-#include <getopt.h>
+#include <getopt.h> /* struct option */
#include "busybox.h"
Modified: trunk/busybox/coreutils/cut.c
===================================================================
--- trunk/busybox/coreutils/cut.c 2005-09-10 04:10:18 UTC (rev 11421)
+++ trunk/busybox/coreutils/cut.c 2005-09-11 01:05:30 UTC (rev 11422)
@@ -23,7 +23,6 @@
#include <stdio.h>
#include <stdlib.h>
-#include <getopt.h>
#include <unistd.h>
#include <string.h>
#include <limits.h>
Modified: trunk/busybox/coreutils/date.c
===================================================================
--- trunk/busybox/coreutils/date.c 2005-09-10 04:10:18 UTC (rev 11421)
+++ trunk/busybox/coreutils/date.c 2005-09-11 01:05:30 UTC (rev 11422)
@@ -29,7 +29,6 @@
#include <time.h>
#include <stdio.h>
#include <string.h>
-#include <getopt.h>
#include "busybox.h"
Modified: trunk/busybox/coreutils/dos2unix.c
===================================================================
--- trunk/busybox/coreutils/dos2unix.c 2005-09-10 04:10:18 UTC (rev 11421)
+++ trunk/busybox/coreutils/dos2unix.c 2005-09-11 01:05:30 UTC (rev 11422)
@@ -28,7 +28,6 @@
*/
#include <string.h>
-#include <getopt.h>
#include <unistd.h>
#include <stdint.h>
#include <fcntl.h>
Modified: trunk/busybox/coreutils/env.c
===================================================================
--- trunk/busybox/coreutils/env.c 2005-09-10 04:10:18 UTC (rev 11421)
+++ trunk/busybox/coreutils/env.c 2005-09-11 01:05:30 UTC (rev 11422)
@@ -47,7 +47,7 @@
#include <stdlib.h>
#include <errno.h>
#include <unistd.h>
-#include <getopt.h>
+#include <getopt.h> /* struct option */
#include "busybox.h"
Modified: trunk/busybox/coreutils/install.c
===================================================================
--- trunk/busybox/coreutils/install.c 2005-09-10 04:10:18 UTC (rev 11421)
+++ trunk/busybox/coreutils/install.c 2005-09-11 01:05:30 UTC (rev 11422)
@@ -23,10 +23,10 @@
#include <sys/stat.h>
#include <sys/types.h>
#include <errno.h>
-#include <getopt.h>
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
+#include <getopt.h> /* struct option */
#include "busybox.h"
#include "libcoreutils/coreutils.h"
Modified: trunk/busybox/coreutils/ls.c
===================================================================
--- trunk/busybox/coreutils/ls.c 2005-09-10 04:10:18 UTC (rev 11421)
+++ trunk/busybox/coreutils/ls.c 2005-09-11 01:05:30 UTC (rev 11422)
@@ -60,7 +60,7 @@
#include <fcntl.h>
#include <signal.h>
#include <termios.h>
-#include <getopt.h>
+#include <getopt.h> /* struct option */
#include <sys/ioctl.h>
#include <sys/sysmacros.h> /* major() and minor() */
#include "busybox.h"
Modified: trunk/busybox/coreutils/mkdir.c
===================================================================
--- trunk/busybox/coreutils/mkdir.c 2005-09-10 04:10:18 UTC (rev 11421)
+++ trunk/busybox/coreutils/mkdir.c 2005-09-11 01:05:30 UTC (rev 11422)
@@ -31,7 +31,7 @@
#include <stdlib.h>
#include <unistd.h>
-#include <getopt.h>
+#include <getopt.h> /* struct option */
#include "busybox.h"
static const struct option mkdir_long_options[] = {
Modified: trunk/busybox/coreutils/mv.c
===================================================================
--- trunk/busybox/coreutils/mv.c 2005-09-10 04:10:18 UTC (rev 11421)
+++ trunk/busybox/coreutils/mv.c 2005-09-11 01:05:30 UTC (rev 11422)
@@ -31,7 +31,7 @@
#include <dirent.h>
#include <errno.h>
#include <stdlib.h>
-#include <getopt.h>
+#include <getopt.h> /* struct option */
#include "busybox.h"
#include "libcoreutils/coreutils.h"
Modified: trunk/busybox/coreutils/stat.c
===================================================================
--- trunk/busybox/coreutils/stat.c 2005-09-10 04:10:18 UTC (rev 11421)
+++ trunk/busybox/coreutils/stat.c 2005-09-11 01:05:30 UTC (rev 11422)
@@ -30,7 +30,7 @@
#include <grp.h>
#include <sys/vfs.h>
#include <time.h>
-#include <getopt.h>
+#include <getopt.h> /* optind */
#include <sys/stat.h>
#include <sys/statfs.h>
#include <sys/statvfs.h>
Modified: trunk/busybox/coreutils/sum.c
===================================================================
--- trunk/busybox/coreutils/sum.c 2005-09-10 04:10:18 UTC (rev 11421)
+++ trunk/busybox/coreutils/sum.c 2005-09-11 01:05:30 UTC (rev 11422)
@@ -18,7 +18,6 @@
#include <sys/stat.h>
#include <fcntl.h>
#include <unistd.h>
-#include <getopt.h>
#include "busybox.h"
Modified: trunk/busybox/coreutils/uudecode.c
===================================================================
--- trunk/busybox/coreutils/uudecode.c 2005-09-10 04:10:18 UTC (rev 11421)
+++ trunk/busybox/coreutils/uudecode.c 2005-09-11 01:05:30 UTC (rev 11422)
@@ -24,7 +24,7 @@
#include <stdio.h>
#include <errno.h>
-#include <getopt.h>
+#include <getopt.h> /* optind */
#include <string.h>
#include <stdlib.h>
Modified: trunk/busybox/coreutils/uuencode.c
===================================================================
--- trunk/busybox/coreutils/uuencode.c 2005-09-10 04:10:18 UTC (rev 11421)
+++ trunk/busybox/coreutils/uuencode.c 2005-09-11 01:05:30 UTC (rev 11422)
@@ -19,7 +19,6 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-#include <getopt.h>
#include <stdio.h>
#include <string.h>
#include <stdlib.h>
Modified: trunk/busybox/debianutils/readlink.c
===================================================================
--- trunk/busybox/debianutils/readlink.c 2005-09-10 04:10:18 UTC (rev 11421)
+++ trunk/busybox/debianutils/readlink.c 2005-09-11 01:05:30 UTC (rev 11422)
@@ -43,8 +43,6 @@
RESERVE_CONFIG_BUFFER(resolved_path, PATH_MAX);
#endif
- /* no options, no getopt */
-
if (optind + 1 != argc)
bb_show_usage();
@@ -58,9 +56,8 @@
if (!buf)
return EXIT_FAILURE;
puts(buf);
-#ifdef CONFIG_FEATURE_CLEAN_UP
- free(buf);
-#endif
+ if (ENABLE_FEATURE_CLEAN_UP) free(buf);
+
return EXIT_SUCCESS;
}
Modified: trunk/busybox/debianutils/start_stop_daemon.c
===================================================================
--- trunk/busybox/debianutils/start_stop_daemon.c 2005-09-10 04:10:18 UTC (rev 11421)
+++ trunk/busybox/debianutils/start_stop_daemon.c 2005-09-11 01:05:30 UTC (rev 11422)
@@ -16,7 +16,7 @@
#include <sys/stat.h>
#include <dirent.h>
#include <unistd.h>
-#include <getopt.h>
+#include <getopt.h> /* struct option */
#include "busybox.h"
#include "pwd_.h"
More information about the busybox-cvs
mailing list