ahp/busybox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Implement optional syslog logging using ordinary

Browse source 
bb_xx_msg calls, and convert networking/* to it.
The rest of bbox will be converted gradually.
This commit is contained in:
Denis Vlasenko 2006-09-06 18:36:50 +00:00
parent 5d725462d4
commit 3538b9a882
39 changed files with 296 additions and 366 deletions
Download patch file Download diff file Expand all files Collapse all files

13
include/libbb.h
View file

@ -112,6 +112,14 @@ extern void *llist_pop(llist_t **elm);
extern void llist_free(llist_t *elm, void (*freeit)(void *data));
enum {
LOGMODE_NONE = 0,
LOGMODE_STDIO = 1<<0,
LOGMODE_SYSLOG = 1<<1,
LOGMODE_BOTH = LOGMODE_SYSLOG + LOGMODE_STDIO,
};
extern int logmode;
extern void bb_show_usage(void) ATTRIBUTE_NORETURN ATTRIBUTE_EXTERNALLY_VISIBLE;
extern void bb_error_msg(const char *s, ...) __attribute__ ((format (printf, 1, 2)));
extern void bb_error_msg_and_die(const char *s, ...) __attribute__ ((noreturn, format (printf, 1, 2)));
@ -124,9 +132,12 @@ extern void bb_herror_msg_and_die(const char *s, ...) __attribute__ ((noreturn,
extern void bb_perror_nomsg_and_die(void) ATTRIBUTE_NORETURN;
extern void bb_perror_nomsg(void);
extern void bb_info_msg(const char *s, ...) __attribute__ ((format (printf, 1, 2)));
/* These two are used internally -- you shouldn't need to use them */
extern void bb_verror_msg(const char *s, va_list p) __attribute__ ((format (printf, 1, 0)));
extern void bb_verror_msg(const char *s, va_list p, const char *strerr) __attribute__ ((format (printf, 1, 0)));
extern void bb_vperror_msg(const char *s, va_list p) __attribute__ ((format (printf, 1, 0)));
extern void bb_vinfo_msg(const char *s, va_list p) __attribute__ ((format (printf, 1, 0)));
extern int bb_echo(int argc, char** argv);
extern int bb_test(int argc, char** argv);

2
include/usage.h
View file

@ -2092,7 +2092,7 @@ USE_FEATURE_MDEV_CONFIG( \
#define nameif_trivial_usage \
"[-s] [-c FILE] [{IFNAME MACADDR}]"
#define nameif_full_usage \
"Nameif renaming network interface while it in the down state.\n\n" \
"Nameif renames network interface while it in the down state.\n\n" \
"Options:\n" \
"\t-c FILE\t\tUse configuration file (default is /etc/mactab)\n" \
"\t-s\t\tUse syslog (LOCAL0 facility)\n" \