summaryrefslogtreecommitdiff
path: root/loginutils/deluser.c
diff options
context:
space:
mode:
authorManuel Novoa III2003-03-19 09:13:01 +0000
committerManuel Novoa III2003-03-19 09:13:01 +0000
commitcad5364599eb5062d59e0c397ed638ddd61a8d5d (patch)
treea318d0f03aa076c74b576ea45dc543a5669e8e91 /loginutils/deluser.c
parente01f9662a5bd5d91be4f6b3941b57fff73cd5af1 (diff)
downloadbusybox-cad5364599eb5062d59e0c397ed638ddd61a8d5d.zip
busybox-cad5364599eb5062d59e0c397ed638ddd61a8d5d.tar.gz
Major coreutils update.
Diffstat (limited to 'loginutils/deluser.c')
-rw-r--r--loginutils/deluser.c38
1 files changed, 19 insertions, 19 deletions
diff --git a/loginutils/deluser.c b/loginutils/deluser.c
index c7d6ece..ad62d41 100644
--- a/loginutils/deluser.c
+++ b/loginutils/deluser.c
@@ -116,19 +116,19 @@ int delgroup_main(int argc, char **argv)
int failure;
if (argc != 2) {
- show_usage();
+ bb_show_usage();
} else {
- failure = del_line_matching(argv[1], group_file);
+ failure = del_line_matching(argv[1], bb_path_group_file);
#ifdef CONFIG_FEATURE_SHADOWPASSWDS
- if (access(gshadow_file, W_OK) == 0) {
+ if (access(bb_path_gshadow_file, W_OK) == 0) {
/* EDR the |= works if the error is not 0, so he had it wrong */
- failure |= del_line_matching(argv[1], gshadow_file);
+ failure |= del_line_matching(argv[1], bb_path_gshadow_file);
}
#endif /* CONFIG_FEATURE_SHADOWPASSWDS */
/* if (!successful) { */
if (failure) {
- error_msg_and_die("%s: Group could not be removed\n", argv[1]);
+ bb_error_msg_and_die("%s: Group could not be removed\n", argv[1]);
}
}
@@ -142,38 +142,38 @@ int deluser_main(int argc, char **argv)
int failure;
if (argc != 2) {
- show_usage();
+ bb_show_usage();
} else {
- failure = del_line_matching(argv[1], passwd_file);
+ failure = del_line_matching(argv[1], bb_path_passwd_file);
/* if (!successful) { */
if (failure) {
- error_msg_and_die("%s: User could not be removed from %s\n",
- argv[1], passwd_file);
+ bb_error_msg_and_die("%s: User could not be removed from %s\n",
+ argv[1], bb_path_passwd_file);
}
#ifdef CONFIG_FEATURE_SHADOWPASSWDS
- failure = del_line_matching(argv[1], shadow_file);
+ failure = del_line_matching(argv[1], bb_path_shadow_file);
/* if (!successful) { */
if (failure) {
- error_msg_and_die("%s: User could not be removed from %s\n",
- argv[1], shadow_file);
+ bb_error_msg_and_die("%s: User could not be removed from %s\n",
+ argv[1], bb_path_shadow_file);
}
- failure = del_line_matching(argv[1], gshadow_file);
+ failure = del_line_matching(argv[1], bb_path_gshadow_file);
/* if (!successful) { */
if (failure) {
- error_msg_and_die("%s: User could not be removed from %s\n",
- argv[1], gshadow_file);
+ bb_error_msg_and_die("%s: User could not be removed from %s\n",
+ argv[1], bb_path_gshadow_file);
}
#endif /* CONFIG_FEATURE_SHADOWPASSWDS */
- failure = del_line_matching(argv[1], group_file);
+ failure = del_line_matching(argv[1], bb_path_group_file);
/* if (!successful) { */
if (failure) {
- error_msg_and_die("%s: User could not be removed from %s\n",
- argv[1], group_file);
+ bb_error_msg_and_die("%s: User could not be removed from %s\n",
+ argv[1], bb_path_group_file);
}
}
return (EXIT_SUCCESS);
}
-/* $Id: deluser.c,v 1.2 2002/06/23 04:24:24 andersen Exp $ */
+/* $Id: deluser.c,v 1.3 2003/03/19 09:12:20 mjn3 Exp $ */