diff options
| author | Denis Vlasenko <vda.linux@googlemail.com> | 2009-04-21 11:09:40 +0000 |
|---|---|---|
| committer | Denis Vlasenko <vda.linux@googlemail.com> | 2009-04-21 11:09:40 +0000 |
| commit | 5e34ff29bcc870936ab18172f438a34d042d4e03 (patch) | |
| tree | a5e7a528f2f916eb883f1161eadceacdf2dca4be /networking/telnetd.c | |
| parent | 8b814b4a349e2262c0ad25793b05206a14651ebb (diff) | |
| download | busybox-w32-5e34ff29bcc870936ab18172f438a34d042d4e03.tar.gz busybox-w32-5e34ff29bcc870936ab18172f438a34d042d4e03.tar.bz2 busybox-w32-5e34ff29bcc870936ab18172f438a34d042d4e03.zip | |
*: mass renaming of USE_XXXX to IF_XXXX
and SKIP_XXXX to IF_NOT_XXXX - the second one was especially
badly named. It was not skipping anything!
Diffstat (limited to 'networking/telnetd.c')
| -rw-r--r-- | networking/telnetd.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/networking/telnetd.c b/networking/telnetd.c index ccf328925..b7162ad36 100644 --- a/networking/telnetd.c +++ b/networking/telnetd.c | |||
| @@ -201,8 +201,8 @@ static size_t iac_safe_write(int fd, const char *buf, size_t count) | |||
| 201 | 201 | ||
| 202 | static struct tsession * | 202 | static struct tsession * |
| 203 | make_new_session( | 203 | make_new_session( |
| 204 | USE_FEATURE_TELNETD_STANDALONE(int sock) | 204 | IF_FEATURE_TELNETD_STANDALONE(int sock) |
| 205 | SKIP_FEATURE_TELNETD_STANDALONE(void) | 205 | IF_NOT_FEATURE_TELNETD_STANDALONE(void) |
| 206 | ) { | 206 | ) { |
| 207 | const char *login_argv[2]; | 207 | const char *login_argv[2]; |
| 208 | struct termios termbuf; | 208 | struct termios termbuf; |
| @@ -437,9 +437,9 @@ int telnetd_main(int argc UNUSED_PARAM, char **argv) | |||
| 437 | #endif | 437 | #endif |
| 438 | /* Even if !STANDALONE, we accept (and ignore) -i, thus people | 438 | /* Even if !STANDALONE, we accept (and ignore) -i, thus people |
| 439 | * don't need to guess whether it's ok to pass -i to us */ | 439 | * don't need to guess whether it's ok to pass -i to us */ |
| 440 | opt = getopt32(argv, "f:l:Ki" USE_FEATURE_TELNETD_STANDALONE("p:b:F"), | 440 | opt = getopt32(argv, "f:l:Ki" IF_FEATURE_TELNETD_STANDALONE("p:b:F"), |
| 441 | &issuefile, &loginpath | 441 | &issuefile, &loginpath |
| 442 | USE_FEATURE_TELNETD_STANDALONE(, &opt_portnbr, &opt_bindaddr)); | 442 | IF_FEATURE_TELNETD_STANDALONE(, &opt_portnbr, &opt_bindaddr)); |
| 443 | if (!IS_INETD /*&& !re_execed*/) { | 443 | if (!IS_INETD /*&& !re_execed*/) { |
| 444 | /* inform that we start in standalone mode? | 444 | /* inform that we start in standalone mode? |
| 445 | * May be useful when people forget to give -i */ | 445 | * May be useful when people forget to give -i */ |
| @@ -455,7 +455,7 @@ int telnetd_main(int argc UNUSED_PARAM, char **argv) | |||
| 455 | openlog(applet_name, LOG_PID, LOG_DAEMON); | 455 | openlog(applet_name, LOG_PID, LOG_DAEMON); |
| 456 | logmode = LOGMODE_SYSLOG; | 456 | logmode = LOGMODE_SYSLOG; |
| 457 | } | 457 | } |
| 458 | USE_FEATURE_TELNETD_STANDALONE( | 458 | IF_FEATURE_TELNETD_STANDALONE( |
| 459 | if (opt & OPT_PORT) | 459 | if (opt & OPT_PORT) |
| 460 | portnbr = xatou16(opt_portnbr); | 460 | portnbr = xatou16(opt_portnbr); |
| 461 | ); | 461 | ); |