svn commit: trunk/busybox: archival/libunarchive include libbb netw etc...
vda at busybox.net
vda at busybox.net
Sat Apr 7 00:44:31 UTC 2007
Author: vda
Date: 2007-04-06 17:44:31 -0700 (Fri, 06 Apr 2007)
New Revision: 18354
Log:
random small shrinkage and elimination of statics
Modified:
trunk/busybox/archival/libunarchive/get_header_ar.c
trunk/busybox/include/libbb.h
trunk/busybox/libbb/verror_msg.c
trunk/busybox/networking/isrv_identd.c
Changeset:
Modified: trunk/busybox/archival/libunarchive/get_header_ar.c
===================================================================
--- trunk/busybox/archival/libunarchive/get_header_ar.c 2007-04-06 16:36:48 UTC (rev 18353)
+++ trunk/busybox/archival/libunarchive/get_header_ar.c 2007-04-07 00:44:31 UTC (rev 18354)
@@ -23,9 +23,9 @@
char magic[2];
} formatted;
} ar;
-#ifdef CONFIG_FEATURE_AR_LONG_FILENAMES
+#if ENABLE_FEATURE_AR_LONG_FILENAMES
static char *ar_long_names;
- static unsigned int ar_long_name_size;
+ static unsigned ar_long_name_size;
#endif
/* dont use xread as we want to handle the error ourself */
Modified: trunk/busybox/include/libbb.h
===================================================================
--- trunk/busybox/include/libbb.h 2007-04-06 16:36:48 UTC (rev 18353)
+++ trunk/busybox/include/libbb.h 2007-04-07 00:44:31 UTC (rev 18354)
@@ -604,7 +604,7 @@
LOGMODE_BOTH = LOGMODE_SYSLOG + LOGMODE_STDIO,
};
extern const char *msg_eol;
-extern int logmode;
+extern smallint logmode;
extern int die_sleep;
extern int xfunc_error_retval;
extern void sleep_and_die(void) ATTRIBUTE_NORETURN;
Modified: trunk/busybox/libbb/verror_msg.c
===================================================================
--- trunk/busybox/libbb/verror_msg.c 2007-04-06 16:36:48 UTC (rev 18353)
+++ trunk/busybox/libbb/verror_msg.c 2007-04-07 00:44:31 UTC (rev 18354)
@@ -10,7 +10,7 @@
#include "libbb.h"
#include <syslog.h>
-int logmode = LOGMODE_STDIO;
+smallint logmode = LOGMODE_STDIO;
const char *msg_eol = "\n";
void bb_verror_msg(const char *s, va_list p, const char* strerr)
Modified: trunk/busybox/networking/isrv_identd.c
===================================================================
--- trunk/busybox/networking/isrv_identd.c 2007-04-06 16:36:48 UTC (rev 18353)
+++ trunk/busybox/networking/isrv_identd.c 2007-04-07 00:44:31 UTC (rev 18354)
@@ -19,7 +19,7 @@
char buf[64 - 2*sizeof(int)];
} identd_buf_t;
-static const char *bogouser = "nobody";
+#define bogouser bb_common_bufsiz1
static int new_peer(isrv_state_t *state, int fd)
{
@@ -108,8 +108,9 @@
int fd;
opt = getopt32(argc, argv, "fiwb:", &bind_address);
- if (optind < argc)
- bogouser = argv[optind];
+ strcpy(bogouser, "nobody");
+ if (argv[optind])
+ strncpy(bogouser, argv[optind], sizeof(bogouser));
/* Daemonize if no -f and no -i and no -w */
if (!(opt & OPT_fiw));
More information about the busybox-cvs
mailing list