de9ec9295
Denis Vlasenko
2006-09-27
Subject
usage.h: fix compile-time bugs exposed by previous change
SOURCE BUG
This commit was genuinely broken at the time (not related to our build system): scripts/config/mkconfigs.c (2005-08-01 - 2006-10-05 arasi) uretilen bbconfigopts.h icine .config satirlarini kacissiz, ham newline'larla gömüyordu - gecerli C degildi, busybox'un kendi bb_mkdep araci bile parse edemiyordu (7d219aab7 ile duzeltildi, mkconfigs shell scripte cevrildi)
Binary
No binary (build failed)
Architecture & Compiler Flags
—
Build Log
(log yok)
Commit Diff GitHub →
include/usage.h+7 -8
| @@ -412,17 +412,17 @@ USE_FEATURE_DATE_ISOFMT( \ | |
| #define deallocvt_trivial_usage \ | |
| "[N]" | |
| #define deallocvt_full_usage \ | |
| - | "Deallocate unused virtual terminal /dev/ttyN" |
| + | "Deallocate unused virtual terminal /dev/ttyN" |
| #define delgroup_trivial_usage \ | |
| "GROUP" | |
| #define delgroup_full_usage \ | |
| - | "Deletes group GROUP from the system" |
| + | "Deletes group GROUP from the system" |
| #define deluser_trivial_usage \ | |
| "USER" | |
| #define deluser_full_usage \ | |
| - | "Deletes user USER from the system" |
| + | "Deletes user USER from the system" |
| #define devfsd_trivial_usage \ | |
| "mntpnt [-v]" \ | |
| @@ -2146,8 +2146,7 @@ USE_FEATURE_MDEV_CONFIG( \ | |
| "changes the password for the current user.\n" \ | |
| "Options:\n" \ | |
| "\t-a\tDefine which algorithm shall be used for the password\n" \ | |
| - | "\t\t\t(Choices: des, md5" \ |
| - | USE_FEATURE_SHA1_PASSWORDS(", sha1") ")\n" \ |
| + | "\t\t\t(Choices: des, md5, sha1)\n" \ |
| "\t-d\tDelete the password for the specified user account\n" \ | |
| "\t-l\tLocks (disables) the specified user account\n" \ | |
| "\t-u\tUnlocks (re-enables) the specified user account" | |
| @@ -2408,9 +2407,9 @@ USE_FEATURE_MDEV_CONFIG( \ | |
| #define route_full_usage \ | |
| "Edit the kernel's routing tables.\n\n" \ | |
| "Options:\n" \ | |
| - | "\t-n\t\tDont resolve names\n" \ |
| - | "\t-e\t\tDisplay other/more information\n" \ |
| - | "\t-A inet" USE_FEATURE_ROUTE_IPV6("{6}") "\tSelect address family" |
| + | "\t-n\tDont resolve names\n" \ |
| + | "\t-e\tDisplay other/more information\n" \ |
| + | "\t-A inet" USE_FEATURE_IPV6("{6}") "\tSelect address family" |
| #define rpm_trivial_usage \ | |
| "-i -q[ildc]p package.rpm" | |
libbb/pw_encrypt.c+1 -3
| @@ -11,13 +11,12 @@ | |
| #include <string.h> | |
| #include <crypt.h> | |
| - | |
| char *pw_encrypt(const char *clear, const char *salt) | |
| { | |
| static char cipher[128]; | |
| char *cp; | |
| - | #ifdef CONFIG_FEATURE_SHA1_PASSWORDS |
| + | #if 0 /* was CONFIG_FEATURE_SHA1_PASSWORDS, but there is no such thing??? */ |
| if (strncmp(salt, "$2$", 3) == 0) { | |
| return sha1_crypt(clear); | |
| } | |
| @@ -29,4 +28,3 @@ char *pw_encrypt(const char *clear, const char *salt) | |
| safe_strncpy(cipher, cp, sizeof(cipher)); | |
| return cipher; | |
| } | |
| - | |