emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Changed #define names for common features (superficial)

Browse Source
This commit is contained in:
Glenn L McGrath 2004-01-17 01:26:53 +00:00
parent 2faf306c73
commit c3b134f3b7
1 changed files with 22 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
networking/inetd.c
View File

@ -155,23 +155,13 @@ static int rlim_ofile_cur = OPEN_MAX;
static struct rlimit rlim_ofile; static struct rlimit rlim_ofile;
#endif #endif
#define INETD_UNSUPPORT_BILTIN 1
/* Check unsupporting builtin */ /* Check unsupporting builtin */
#ifdef CONFIG_FEATURE_INETD_SUPPORT_BILTIN_ECHO #if defined CONFIG_FEATURE_INETD_SUPPORT_BILTIN_ECHO || \
#undef INETD_UNSUPPORT_BILTIN defined CONFIG_FEATURE_INETD_SUPPORT_BILTIN_DISCARD || \
#endif defined CONFIG_FEATURE_INETD_SUPPORT_BILTIN_TIME || \
#ifdef CONFIG_FEATURE_INETD_SUPPORT_BILTIN_DISCARD defined CONFIG_FEATURE_INETD_SUPPORT_BILTIN_DAYTIME || \
#undef INETD_UNSUPPORT_BILTIN defined CONFIG_FEATURE_INETD_SUPPORT_BILTIN_CHARGEN
#endif # define INETD_FEATURE_ENABLED
#ifdef CONFIG_FEATURE_INETD_SUPPORT_BILTIN_TIME
#undef INETD_UNSUPPORT_BILTIN
#endif
#ifdef CONFIG_FEATURE_INETD_SUPPORT_BILTIN_DAYTIME
#undef INETD_UNSUPPORT_BILTIN
#endif
#ifdef CONFIG_FEATURE_INETD_SUPPORT_BILTIN_CHARGEN
#undef INETD_UNSUPPORT_BILTIN
#endif #endif
static struct servtab { static struct servtab {
@ -183,7 +173,7 @@ static struct servtab {
short se_checked; /* looked at during merge */ short se_checked; /* looked at during merge */
char *se_user; /* user name to run as */ char *se_user; /* user name to run as */
char *se_group; /* group name to run as */ char *se_group; /* group name to run as */
#ifndef INETD_UNSUPPORT_BILTIN #ifdef INETD_FEATURE_ENABLED
const struct biltin *se_bi; /* if built-in, description */ const struct biltin *se_bi; /* if built-in, description */
#endif #endif
char *se_server; /* server program */ char *se_server; /* server program */
@ -240,7 +230,8 @@ static void chargen_stream(int, struct servtab *);
static void chargen_dg(int, struct servtab *); static void chargen_dg(int, struct servtab *);
#endif #endif
#ifndef INETD_UNSUPPORT_BILTIN
#ifdef INETD_FEATURE_ENABLED
struct biltin { struct biltin {
const char *bi_service; /* internally provided service name */ const char *bi_service; /* internally provided service name */
int bi_socktype; /* type of socket supported */ int bi_socktype; /* type of socket supported */
@ -277,7 +268,7 @@ static const struct biltin biltins[] = {
#endif #endif
{ NULL, 0, 0, 0, NULL } { NULL, 0, 0, 0, NULL }
}; };
#endif /* INETD_UNSUPPORT_BILTIN */ #endif /* INETD_FEATURE_ENABLED */
#define NUMINT (sizeof(intab) / sizeof(struct inent)) #define NUMINT (sizeof(intab) / sizeof(struct inent))
static const char *CONFIG = _PATH_INETDCONF; static const char *CONFIG = _PATH_INETDCONF;
@ -423,7 +414,7 @@ more:
} }
sep->se_server = newstr(skip(&cp)); sep->se_server = newstr(skip(&cp));
if (strcmp(sep->se_server, "internal") == 0) { if (strcmp(sep->se_server, "internal") == 0) {
#ifndef INETD_UNSUPPORT_BILTIN #ifdef INETD_FEATURE_ENABLED
const struct biltin *bi; const struct biltin *bi;
for (bi = biltins; bi->bi_service; bi++) for (bi = biltins; bi->bi_service; bi++)
@ -443,8 +434,8 @@ more:
goto more; goto more;
#endif #endif
} else } else
#ifndef INETD_UNSUPPORT_BILTIN #ifdef INETD_FEATURE_ENABLED
sep->se_bi = NULL sep->se_bi = NULL
#endif #endif
; ;
argc = 0; argc = 0;
@ -471,7 +462,7 @@ freeconfig(struct servtab *cp)
free(cp->se_argv[i]); free(cp->se_argv[i]);
} }
#ifndef INETD_UNSUPPORT_BILTIN #ifdef INETD_FEATURE_ENABLED
static char **Argv; static char **Argv;
static char *LastArg; static char *LastArg;
@ -494,7 +485,7 @@ setproctitle(char *a, int s)
while (cp < LastArg) while (cp < LastArg)
*cp++ = ' '; *cp++ = ' ';
} }
#endif /* INETD_UNSUPPORT_BILTIN */ #endif /* INETD_FEATURE_ENABLED */
static struct servtab * static struct servtab *
enter(struct servtab *cp) enter(struct servtab *cp)
@ -622,7 +613,7 @@ config(int signum)
* wait. * wait.
*/ */
if ( if (
#ifndef INETD_UNSUPPORT_BILTIN #ifdef INETD_FEATURE_ENABLED
cp->se_bi == 0 && cp->se_bi == 0 &&
#endif #endif
(sep->se_wait == 1 || cp->se_wait == 0)) (sep->se_wait == 1 || cp->se_wait == 0))
@ -796,17 +787,17 @@ inetd_main(int argc, char *argv[])
char *sq; char *sq;
gid_t gid; gid_t gid;
#ifdef INETD_UNSUPPORT_BILTIN #ifdef INETD_FEATURE_ENABLED
# define dofork 1
#else
int dofork; int dofork;
extern char **environ; extern char **environ;
#else
# define dofork 1
#endif #endif
gid = getgid(); gid = getgid();
setgroups(1, &gid); setgroups(1, &gid);
#ifndef INETD_UNSUPPORT_BILTIN #ifdef INETD_FEATURE_ENABLED
Argv = argv; Argv = argv;
if (environ == 0 || *environ == 0) if (environ == 0 || *environ == 0)
environ = argv; environ = argv;
@ -929,7 +920,7 @@ inetd_main(int argc, char *argv[])
ctrl = sep->se_fd; ctrl = sep->se_fd;
sigprocmask(SIG_BLOCK, &blockmask, NULL); sigprocmask(SIG_BLOCK, &blockmask, NULL);
pid = 0; pid = 0;
#ifndef INETD_UNSUPPORT_BILTIN #ifdef INETD_FEATURE_ENABLED
dofork = (sep->se_bi == 0 || sep->se_bi->bi_fork); dofork = (sep->se_bi == 0 || sep->se_bi->bi_fork);
#endif #endif
if (dofork) { if (dofork) {
@ -979,7 +970,7 @@ inetd_main(int argc, char *argv[])
} }
sigprocmask(SIG_SETMASK, &emptymask, NULL); sigprocmask(SIG_SETMASK, &emptymask, NULL);
if (pid == 0) { if (pid == 0) {
#ifndef INETD_UNSUPPORT_BILTIN #ifdef INETD_FEATURE_ENABLED
if (sep->se_bi) if (sep->se_bi)
(*sep->se_bi->bi_fn)(ctrl, sep); (*sep->se_bi->bi_fn)(ctrl, sep);
else else