summaryrefslogtreecommitdiff
path: root/loginutils
diff options
context:
space:
mode:
authorDenis Vlasenko <vda.linux@googlemail.com>2008-03-26 20:04:27 +0000
committerDenis Vlasenko <vda.linux@googlemail.com>2008-03-26 20:04:27 +0000
commit8ee649a02e97e9d4e770a8138ba94c0f3ddd8055 (patch)
treecf13ce448542a36595264ad53397a0633ffedcc8 /loginutils
parentce7eb4443cc90038aabc19a8b7b8f25e4b88892e (diff)
downloadbusybox-w32-8ee649a02e97e9d4e770a8138ba94c0f3ddd8055.tar.gz
busybox-w32-8ee649a02e97e9d4e770a8138ba94c0f3ddd8055.tar.bz2
busybox-w32-8ee649a02e97e9d4e770a8138ba94c0f3ddd8055.zip
*: more uniform naming: s/xmalloc_getline/xmalloc_fgetline/
Diffstat (limited to 'loginutils')
-rw-r--r--loginutils/addgroup.c2
-rw-r--r--loginutils/chpasswd.c2
-rw-r--r--loginutils/cryptpw.c2
3 files changed, 3 insertions, 3 deletions
diff --git a/loginutils/addgroup.c b/loginutils/addgroup.c
index 367c6b9f0..c9495b2c1 100644
--- a/loginutils/addgroup.c
+++ b/loginutils/addgroup.c
@@ -83,7 +83,7 @@ static void add_user_to_group(char **args,
83 83
84 if (!group_file) return; 84 if (!group_file) return;
85 85
86 while ((line = xmalloc_getline(group_file))) { 86 while ((line = xmalloc_fgetline(group_file)) != NULL) {
87 /* Find the group */ 87 /* Find the group */
88 if (!strncmp(line, args[1], len) 88 if (!strncmp(line, args[1], len)
89 && line[len] == ':' 89 && line[len] == ':'
diff --git a/loginutils/chpasswd.c b/loginutils/chpasswd.c
index cb13ebb2d..5dc7a9bf0 100644
--- a/loginutils/chpasswd.c
+++ b/loginutils/chpasswd.c
@@ -33,7 +33,7 @@ int chpasswd_main(int argc ATTRIBUTE_UNUSED, char **argv)
33 USE_GETOPT_LONG(applet_long_options = chpasswd_longopts;) 33 USE_GETOPT_LONG(applet_long_options = chpasswd_longopts;)
34 opt = getopt32(argv, "em"); 34 opt = getopt32(argv, "em");
35 35
36 while ((name = xmalloc_getline(stdin)) != NULL) { 36 while ((name = xmalloc_fgetline(stdin)) != NULL) {
37 pass = strchr(name, ':'); 37 pass = strchr(name, ':');
38 if (!pass) 38 if (!pass)
39 bb_error_msg_and_die("missing new password"); 39 bb_error_msg_and_die("missing new password");
diff --git a/loginutils/cryptpw.c b/loginutils/cryptpw.c
index c5170c6a4..68f5e8074 100644
--- a/loginutils/cryptpw.c
+++ b/loginutils/cryptpw.c
@@ -22,7 +22,7 @@ int cryptpw_main(int argc ATTRIBUTE_UNUSED, char **argv)
22 crypt_make_salt(salt, 1, 0); /* des */ 22 crypt_make_salt(salt, 1, 0); /* des */
23 } 23 }
24 24
25 puts(pw_encrypt(argv[optind] ? argv[optind] : xmalloc_getline(stdin), salt)); 25 puts(pw_encrypt(argv[optind] ? argv[optind] : xmalloc_fgetline(stdin), salt));
26 26
27 return 0; 27 return 0;
28} 28}