04c99ebb4
Denis Vlasenko
2007-04-07
Subject
random small shrinkage and elimination of statics
Binary
No binary (build failed)
Architecture & Compiler Flags
—
Build Log
(log yok)
Commit Diff GitHub →
archival/libunarchive/get_header_ar.c +2 -2include/libbb.h +1 -1libbb/verror_msg.c +1 -1networking/isrv_identd.c +4 -3
archival/libunarchive/get_header_ar.c+2 -2
| @@ -23,9 +23,9 @@ char get_header_ar(archive_handle_t *archive_handle) | |
| 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 */ | |
include/libbb.h+1 -1
| @@ -604,7 +604,7 @@ enum { | |
| 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; | |
libbb/verror_msg.c+1 -1
| @@ -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) | |
networking/isrv_identd.c+4 -3
| @@ -19,7 +19,7 @@ typedef struct identd_buf_t { | |
| 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 fakeidentd_main(int argc, char **argv) | |
| 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)); | |