aboutsummaryrefslogtreecommitdiff
path: root/loginutils
diff options
context:
space:
mode:
authorDenis Vlasenko <vda.linux@googlemail.com>2007-08-12 20:58:27 +0000
committerDenis Vlasenko <vda.linux@googlemail.com>2007-08-12 20:58:27 +0000
commit6ca409e0e4c198fe3081346eebbae3f068fe605a (patch)
tree060cb05d99220a1eda399194d1209c269f0e8cd8 /loginutils
parent4185548984357df91311f30c8e43d95f33922576 (diff)
downloadbusybox-w32-6ca409e0e4c198fe3081346eebbae3f068fe605a.tar.gz
busybox-w32-6ca409e0e4c198fe3081346eebbae3f068fe605a.tar.bz2
busybox-w32-6ca409e0e4c198fe3081346eebbae3f068fe605a.zip
trylink: produce even more info about final link stage
trylink: explain how to modify link and drastically decrease amount of padding (unfortunately, needs hand editing ATM). *: add ALIGN1 / ALIGN2 to global strings and arrays of bytes and shorts size saving: 0.5k
Diffstat (limited to 'loginutils')
-rw-r--r--loginutils/adduser.c3
-rw-r--r--loginutils/chpasswd.c2
-rw-r--r--loginutils/getty.c2
-rw-r--r--loginutils/sulogin.c4
4 files changed, 6 insertions, 5 deletions
diff --git a/loginutils/adduser.c b/loginutils/adduser.c
index 6c69aaf41..79cd2f4f7 100644
--- a/loginutils/adduser.c
+++ b/loginutils/adduser.c
@@ -81,7 +81,8 @@ static void passwd_wrapper(const char *login) ATTRIBUTE_NORETURN;
81 81
82static void passwd_wrapper(const char *login) 82static void passwd_wrapper(const char *login)
83{ 83{
84 static const char prog[] = "passwd"; 84 static const char prog[] ALIGN1 = "passwd";
85
85 BB_EXECLP(prog, prog, login, NULL); 86 BB_EXECLP(prog, prog, login, NULL);
86 bb_error_msg_and_die("failed to execute '%s', you must set the password for '%s' manually", prog, login); 87 bb_error_msg_and_die("failed to execute '%s', you must set the password for '%s' manually", prog, login);
87} 88}
diff --git a/loginutils/chpasswd.c b/loginutils/chpasswd.c
index 3e02c8e7c..6fb4dca7a 100644
--- a/loginutils/chpasswd.c
+++ b/loginutils/chpasswd.c
@@ -11,7 +11,7 @@
11#if ENABLE_GETOPT_LONG 11#if ENABLE_GETOPT_LONG
12#include <getopt.h> 12#include <getopt.h>
13 13
14static const char chpasswd_longopts[] = 14static const char chpasswd_longopts[] ALIGN1 =
15 "encrypted\0" No_argument "e" 15 "encrypted\0" No_argument "e"
16 "md5\0" No_argument "m" 16 "md5\0" No_argument "m"
17 ; 17 ;
diff --git a/loginutils/getty.c b/loginutils/getty.c
index 2fcb0d902..0254d3203 100644
--- a/loginutils/getty.c
+++ b/loginutils/getty.c
@@ -93,7 +93,7 @@ struct options {
93 int speeds[MAX_SPEED]; /* baud rates to be tried */ 93 int speeds[MAX_SPEED]; /* baud rates to be tried */
94}; 94};
95 95
96static const char opt_string[] = "I:LH:f:hil:mt:wn"; 96static const char opt_string[] ALIGN1 = "I:LH:f:hil:mt:wn";
97#define F_INITSTRING (1<<0) /* initstring is set */ 97#define F_INITSTRING (1<<0) /* initstring is set */
98#define F_LOCAL (1<<1) /* force local */ 98#define F_LOCAL (1<<1) /* force local */
99#define F_FAKEHOST (1<<2) /* force fakehost */ 99#define F_FAKEHOST (1<<2) /* force fakehost */
diff --git a/loginutils/sulogin.c b/loginutils/sulogin.c
index 36b10fbc4..5638c4bc9 100644
--- a/loginutils/sulogin.c
+++ b/loginutils/sulogin.c
@@ -9,7 +9,7 @@
9 9
10#include "libbb.h" 10#include "libbb.h"
11 11
12static const char * const forbid[] = { 12static const char *const forbid[] = {
13 "ENV", 13 "ENV",
14 "BASH_ENV", 14 "BASH_ENV",
15 "HOME", 15 "HOME",
@@ -40,7 +40,7 @@ int sulogin_main(int argc, char **argv)
40 char *cp; 40 char *cp;
41 int timeout = 0; 41 int timeout = 0;
42 char *timeout_arg; 42 char *timeout_arg;
43 const char * const *p; 43 const char *const *p;
44 struct passwd *pwd; 44 struct passwd *pwd;
45 const char *shell; 45 const char *shell;
46#if ENABLE_FEATURE_SHADOWPASSWDS 46#if ENABLE_FEATURE_SHADOWPASSWDS