summaryrefslogtreecommitdiff
path: root/busybox/include
diff options
context:
space:
mode:
authorRob Landley2005-08-13 00:26:01 +0000
committerRob Landley2005-08-13 00:26:01 +0000
commitfc455b2101edbf97331384831de2989ce9cdb731 (patch)
tree521f09b4ca5cb42280e51c7618930ea4f0e68dfb /busybox/include
parent365a345e92c25c60c977aa1596e31a1e6b9cea80 (diff)
downloadbusybox-fc455b2101edbf97331384831de2989ce9cdb731.zip
busybox-fc455b2101edbf97331384831de2989ce9cdb731.tar.gz
1.0 backports of:
10861, 10875, 10881, 10888 ash fix 10865 suid thing? (look at this) 10886 telnet bugfix 10866 ftp fix for RFC 959 compliance. 10867 Remove spurious newline from cp -i prompt. 10874 ksyslogd fix 10876 msh fix 10877 httpd fix 10880, 10889, 11005 dhcp fixes
Diffstat (limited to 'busybox/include')
-rw-r--r--busybox/include/applets.h2
-rw-r--r--busybox/include/usage.h5
2 files changed, 4 insertions, 3 deletions
diff --git a/busybox/include/applets.h b/busybox/include/applets.h
index 21f82f5..d89500e 100644
--- a/busybox/include/applets.h
+++ b/busybox/include/applets.h
@@ -672,7 +672,7 @@
#endif
#if !defined(PROTOTYPES) && !defined(MAKE_USAGE)
- { 0,NULL,0 }
+ { 0,NULL,0,0 }
};
#endif
diff --git a/busybox/include/usage.h b/busybox/include/usage.h
index ad44101..b58c572 100644
--- a/busybox/include/usage.h
+++ b/busybox/include/usage.h
@@ -2610,9 +2610,10 @@
"/dev/tty2\n"
#define udhcpc_trivial_usage \
- "[-fbnqv] [-c CLIENTID] [-H HOSTNAME] [-i INTERFACE]\n[-p pidfile] [-r IP] [-s script]"
+ "[-Cfbnqv] [-c CLIENTID] [-H HOSTNAME] [-i INTERFACE]\n[-p pidfile] [-r IP] [-s script]"
#define udhcpc_full_usage \
- "\t-c,\t--clientid=CLIENTID\tClient identifier\n" \
+ "\t-c,\t--clientid=CLIENTID\tSet client identifier\n" \
+ "\t-C,\t--clientid-none\tSuppress default client identifier\n" \
"\t-H,\t--hostname=HOSTNAME\tClient hostname\n" \
"\t-h,\t \tAlias for -H\n" \
"\t-f,\t--foreground\tDo not fork after getting lease\n" \