#include <sys/types.h>
#include <sys/wait.h>
#include <unistd.h>
+#include <getopt.h>
#include "c.h"
#include "fileutils.h"
VIPW,
VIGR
};
-int program;
-char orig_file[FILENAMELEN]; /* original file /etc/passwd or /etc/group */
-char *tmp_file; /* tmp file */
+static int program;
+static char orig_file[FILENAMELEN]; /* original file /etc/passwd or /etc/group */
+static char *tmp_file; /* tmp file */
void pw_error (char *, int, int);
if (nr < 0)
pw_error(orig_file, 1, 1);
+#ifdef HAVE_EXPLICIT_BZERO
+ explicit_bzero(buf, sizeof(buf));
+#endif
}
static void pw_init(void)
}
unlink(tmp_file);
free(tmp_file);
+ tmp_file = NULL;
}
static void pw_edit(void)
if (!pid) {
execlp(editor, p, tmp_file, NULL);
- /* Shouldn't get here */
- _exit(EXIT_FAILURE);
+ errexec(editor);
}
for (;;) {
pid = waitpid(pid, &pstat, WUNTRACED);
warn(NULL);
}
warnx(_("%s unchanged"), orig_file);
- unlink(tmp_file);
+
+ if (tmp_file)
+ unlink(tmp_file);
ulckpwdf();
exit(eval);
}
if (lckpwdf() < 0)
err(EXIT_FAILURE, _("cannot get lock"));
- passwd_file = open(orig_file, O_RDONLY, 0);
+ passwd_file = open(orig_file, O_RDONLY | O_CLOEXEC, 0);
if (passwd_file < 0)
err(EXIT_FAILURE, _("cannot open %s"), orig_file);
tmp_fd = pw_tmpfile(passwd_file);
if (end.st_nlink == 0) {
if (close_stream(tmp_fd) != 0)
err(EXIT_FAILURE, _("write error"));
- tmp_fd = fopen(tmp_file, "r");
- if (!tmp_file)
+ tmp_fd = fopen(tmp_file, "r" UL_CLOEXECSTR);
+ if (!tmp_fd)
err(EXIT_FAILURE, _("cannot open %s"), tmp_file);
if (fstat(fileno(tmp_fd), &end))
pw_error(tmp_file, 1, 1);
ulckpwdf();
}
-static void __attribute__((__noreturn__)) usage(FILE *out)
+static void __attribute__((__noreturn__)) usage(void)
{
+ FILE *out = stdout;
fputs(USAGE_HEADER, out);
fprintf(out, " %s\n", program_invocation_short_name);
fputs(_("Edit the password or group file.\n"), out);
fputs(USAGE_OPTIONS, out);
- fputs(USAGE_HELP, out);
- fputs(USAGE_VERSION, out);
- fprintf(out, USAGE_MAN_TAIL("vipw(8)"));
- exit(out == stderr ? EXIT_FAILURE : EXIT_SUCCESS);
+ printf(USAGE_HELP_OPTIONS(16));
+ printf(USAGE_MAN_TAIL("vipw(8)"));
+ exit(EXIT_SUCCESS);
}
int main(int argc, char *argv[])
{
+ int c;
+ static const struct option longopts[] = {
+ {"version", no_argument, NULL, 'V'},
+ {"help", no_argument, NULL, 'h'},
+ {NULL, 0, NULL, 0}
+ };
+
setlocale(LC_ALL, "");
bindtextdomain(PACKAGE, LOCALEDIR);
textdomain(PACKAGE);
- atexit(close_stdout);
+ close_stdout_atexit();
if (!strcmp(program_invocation_short_name, "vigr")) {
program = VIGR;
xstrncpy(orig_file, PASSWD_FILE, sizeof(orig_file));
}
- if (1 < argc) {
- if (!strcmp(argv[1], "-V") || !strcmp(argv[1], "--version")) {
- printf(UTIL_LINUX_VERSION);
- exit(EXIT_SUCCESS);
+ while ((c = getopt_long(argc, argv, "Vh", longopts, NULL)) != -1) {
+ switch (c) {
+ case 'V':
+ print_version(EXIT_SUCCESS);
+ case 'h':
+ usage();
+ default:
+ errtryhelp(EXIT_FAILURE);
}
- if (!strcmp(argv[1], "-h") || !strcmp(argv[1], "--help"))
- usage(stdout);
- usage(stderr);
}
edit_file(0);
- if (program == VIGR) {
- strncpy(orig_file, SGROUP_FILE, FILENAMELEN - 1);
- } else {
- strncpy(orig_file, SHADOW_FILE, FILENAMELEN - 1);
- }
+ if (program == VIGR)
+ xstrncpy(orig_file, SGROUP_FILE, sizeof(orig_file));
+ else
+ xstrncpy(orig_file, SHADOW_FILE, sizeof(orig_file));
if (access(orig_file, F_OK) == 0) {
char response[80];
* which means they can be translated. */
printf(_("Would you like to edit %s now [y/n]? "), orig_file);
- if (fgets(response, sizeof(response), stdin)) {
- if (rpmatch(response) == RPMATCH_YES)
- edit_file(1);
- }
+ if (fgets(response, sizeof(response), stdin) &&
+ rpmatch(response) == RPMATCH_YES)
+ edit_file(1);
}
exit(EXIT_SUCCESS);
}