diff options
| author | Rob Landley <rob@landley.net> | 2005-10-28 09:24:33 +0000 |
|---|---|---|
| committer | Rob Landley <rob@landley.net> | 2005-10-28 09:24:33 +0000 |
| commit | 1b751c894b520846af8575d09187ce342e88778c (patch) | |
| tree | ea1bfb15742becbaab52960ee9fad82aba9fbcee /networking/telnet.c | |
| parent | 0f34a821ab99e4936c7aa4974f58784442172211 (diff) | |
| download | busybox-1b751c894b520846af8575d09187ce342e88778c.tar.gz | |
Rob Sullivan sent in some cleanups, which I beat on slightly.
Diffstat (limited to 'networking/telnet.c')
| -rw-r--r-- | networking/telnet.c | 36 |
1 files changed, 5 insertions, 31 deletions
diff --git a/networking/telnet.c b/networking/telnet.c index 24160057b..d9f0e94bc 100644 --- a/networking/telnet.c +++ b/networking/telnet.c @@ -8,19 +8,7 @@ * Created: Thu Apr 7 13:29:41 1994 too * Last modified: Fri Jun 9 14:34:24 2000 too * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Licensed under the GPL v2 or later, see the file LICENSE in this tarball. * * HISTORY * Revision 3.1 1994/04/17 11:31:54 too @@ -636,10 +624,6 @@ extern int telnet_main(int argc, char** argv) int maxfd; #endif -#ifdef CONFIG_FEATURE_TELNET_AUTOLOGIN - int opt; -#endif - #ifdef CONFIG_FEATURE_AUTOWIDTH get_terminal_width_height(0, &win_width, &win_height); #endif @@ -661,20 +645,10 @@ extern int telnet_main(int argc, char** argv) bb_show_usage(); #ifdef CONFIG_FEATURE_TELNET_AUTOLOGIN - autologin = NULL; - while ((opt = getopt(argc, argv, "al:")) != EOF) { - switch (opt) { - case 'l': - autologin = optarg; - break; - case 'a': - autologin = getenv("USER"); - break; - case '?': - bb_show_usage(); - break; - } - } + unsigned long flags = bb_getopt_ulflags(argc, argv, "al:", &autologin); + if (flags & 1) + autologin = getenv("USER"); + if (optind < argc) { bb_lookup_host(&s_in, argv[optind++]); s_in.sin_port = bb_lookup_port((optind < argc) ? argv[optind++] : |