diff options
author | Eric Andersen <andersen@codepoet.org> | 2002-09-16 06:22:25 +0000 |
---|---|---|
committer | Eric Andersen <andersen@codepoet.org> | 2002-09-16 06:22:25 +0000 |
commit | c38678d14b87f8e2d4f0d610d0aa61c656f17539 (patch) | |
tree | 8a08f41faae7672a634f32234dee4b5308cda39c /include | |
parent | 166fa4684f33579277f34d887537c2abefc9deb0 (diff) | |
download | busybox-w32-c38678d14b87f8e2d4f0d610d0aa61c656f17539.tar.gz busybox-w32-c38678d14b87f8e2d4f0d610d0aa61c656f17539.tar.bz2 busybox-w32-c38678d14b87f8e2d4f0d610d0aa61c656f17539.zip |
Apply vodz' last_patch52
Diffstat (limited to 'include')
-rw-r--r-- | include/applets.h | 4 | ||||
-rw-r--r-- | include/libbb.h | 2 | ||||
-rw-r--r-- | include/usage.h | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/include/applets.h b/include/applets.h index f6a840024..d5c257052 100644 --- a/include/applets.h +++ b/include/applets.h | |||
@@ -23,11 +23,11 @@ | |||
23 | #elif defined(MAKE_USAGE) | 23 | #elif defined(MAKE_USAGE) |
24 | #ifdef CONFIG_FEATURE_VERBOSE_USAGE | 24 | #ifdef CONFIG_FEATURE_VERBOSE_USAGE |
25 | #define APPLET(a,b,c,d) a##_trivial_usage "\n\n" a##_full_usage "\0" | 25 | #define APPLET(a,b,c,d) a##_trivial_usage "\n\n" a##_full_usage "\0" |
26 | #define APPLET_NOUSAGE(a,b,c,d) "\0" | 26 | #define APPLET_NOUSAGE(a,b,c,d) "\b\0" |
27 | #define APPLET_ODDNAME(a,b,c,d,e) e##_trivial_usage "\n\n" e##_full_usage "\0" | 27 | #define APPLET_ODDNAME(a,b,c,d,e) e##_trivial_usage "\n\n" e##_full_usage "\0" |
28 | #else | 28 | #else |
29 | #define APPLET(a,b,c,d) a##_trivial_usage "\0" | 29 | #define APPLET(a,b,c,d) a##_trivial_usage "\0" |
30 | #define APPLET_NOUSAGE(a,b,c,d) "\0" | 30 | #define APPLET_NOUSAGE(a,b,c,d) "\b\0" |
31 | #define APPLET_ODDNAME(a,b,c,d,e) e##_trivial_usage "\0" | 31 | #define APPLET_ODDNAME(a,b,c,d,e) e##_trivial_usage "\0" |
32 | #endif | 32 | #endif |
33 | #elif defined(MAKE_LINKS) | 33 | #elif defined(MAKE_LINKS) |
diff --git a/include/libbb.h b/include/libbb.h index 252496e0f..6ab942bd8 100644 --- a/include/libbb.h +++ b/include/libbb.h | |||
@@ -123,7 +123,7 @@ extern int parse_mode( const char* s, mode_t* theMode); | |||
123 | 123 | ||
124 | extern int get_kernel_revision(void); | 124 | extern int get_kernel_revision(void); |
125 | 125 | ||
126 | extern int get_console_fd(char* tty_name); | 126 | extern int get_console_fd(void); |
127 | extern struct mntent *find_mount_point(const char *name, const char *table); | 127 | extern struct mntent *find_mount_point(const char *name, const char *table); |
128 | extern void write_mtab(char* blockDevice, char* directory, | 128 | extern void write_mtab(char* blockDevice, char* directory, |
129 | char* filesystemType, long flags, char* string_flags); | 129 | char* filesystemType, long flags, char* string_flags); |
diff --git a/include/usage.h b/include/usage.h index ee697150b..968823e54 100644 --- a/include/usage.h +++ b/include/usage.h | |||
@@ -1369,7 +1369,7 @@ | |||
1369 | #define passwd_trivial_usage \ | 1369 | #define passwd_trivial_usage \ |
1370 | "[OPTION] [name]" | 1370 | "[OPTION] [name]" |
1371 | #define passwd_full_usage \ | 1371 | #define passwd_full_usage \ |
1372 | "CChange a user password. If no name is specified,\n" \ | 1372 | "Change a user password. If no name is specified,\n" \ |
1373 | "changes the password for the current user.\n" \ | 1373 | "changes the password for the current user.\n" \ |
1374 | "Options:\n" \ | 1374 | "Options:\n" \ |
1375 | "\t-a\tDefine which algorithm shall be used for the password.\n" \ | 1375 | "\t-a\tDefine which algorithm shall be used for the password.\n" \ |