Skip to content

src/vipw.c: Some readability improvements #1506

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
alejandro-colomar wants to merge 4 commits into
base: master
Choose a base branch
from
Open

src/vipw.c: Some readability improvements #1506

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ba27034
src/vipw.c: vipwedit(): Reduce scope of local variable
alejandro-colomar Jan 15, 2026
b958d7a
src/vipw.c: vipwexit(), usage(): Mark as [[noreturn]]
alejandro-colomar Jan 15, 2026
4e60479
src/vipw.c: vipwedit(): Don't else after [[noreturn]]
alejandro-colomar Jan 15, 2026
51a5e0a
src/vipw.c: vipwedit(): Set fileedit closer to its use
alejandro-colomar Jan 15, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
59 changes: 33 additions & 26 deletions src/vipw.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
#include <unistd.h>
#include <utime.h>

#include "attr.h"
#include "defines.h"
#include "getdef.h"
#include "groupio.h"
Expand Down Expand Up @@ -72,15 +73,16 @@ static bool tcb_mode = false;
#endif /* WITH_TCB */

/* local function prototypes */
static void usage (int status);
NORETURN static void usage(int status);
static int create_backup_file (FILE *, char *, struct stat *);
static void vipwexit (const char *msg, int syserr, int ret);
NORETURN static void vipwexit(const char *msg, int syserr, int ret);
static void vipwedit (const char *, int (*)(void), int (*)(bool));

/*
* usage - display usage message and exit
*/
static void usage (int status)
static void
usage(int status)
{
FILE *usageout = (E_SUCCESS != status) ? stderr : stdout;
(void) fprintf (usageout,
Expand Down Expand Up @@ -153,7 +155,8 @@ static int create_backup_file (FILE * fp, char *backup, struct stat *sb)
/*
*
*/
static void vipwexit (const char *msg, int syserr, int ret)
static void
vipwexit(const char *msg, int syserr, int ret)
{
int err = errno;

Expand Down Expand Up @@ -216,18 +219,10 @@ vipwedit (const char *file, int (*file_lock) (void), int (*file_unlock) (bool))
if (shadowtcb_drop_priv () == SHADOWTCB_FAILURE) {
vipwexit (_("failed to drop privileges"), errno, 1);
}
stprintf_a(fileedit,
TCB_DIR "/" SHADOWTCB_SCRATCHDIR "/.%s.shadow.%s.XXXXXX",
Prog, user);
} else {
#endif /* WITH_TCB */
stprintf_a(fileedit, "/etc/.%s.XXXXXX", Prog);
#ifdef WITH_TCB
}
#endif /* WITH_TCB */
#endif
unlock = file_unlock;
filename = file;
fileeditname = fileedit;

if (access (file, F_OK) != 0) {
vipwexit (file, 1, 1);
Expand Down Expand Up @@ -271,6 +266,16 @@ vipwedit (const char *file, int (*file_lock) (void), int (*file_unlock) (bool))
if (NULL == f) {
vipwexit (file, 1, 1);
}
#ifdef WITH_TCB
if (tcb_mode) {
stprintf_a(fileedit,
TCB_DIR "/" SHADOWTCB_SCRATCHDIR "/.%s.shadow.%s.XXXXXX",
Prog, user);
} else
#endif
{
stprintf_a(fileedit, "/etc/.%s.XXXXXX", Prog);
}
#ifdef WITH_TCB
if (tcb_mode && (shadowtcb_gain_priv () == SHADOWTCB_FAILURE))
vipwexit (_("failed to gain privileges"), errno, 1);
Expand All @@ -279,6 +284,7 @@ vipwedit (const char *file, int (*file_lock) (void), int (*file_unlock) (bool))
vipwexit (_("Couldn't make backup"), errno, 1);
}
(void) fclose (f);
fileeditname = fileedit;
Comment thread
alejandro-colomar marked this conversation as resolved.
Dismissed
createedit = true;

editor = getenv ("VISUAL");
Expand Down Expand Up @@ -316,18 +322,18 @@ vipwedit (const char *file, int (*file_lock) (void), int (*file_unlock) (bool))
if (-1 == status) {
fprintf(stderr, _("%s: %s: %s\n"), Prog, editor, strerrno());
exit (1);
} else if ( WIFEXITED (status)
&& (WEXITSTATUS (status) != 0)) {
}
if (WIFEXITED(status) && WEXITSTATUS(status) != 0) {
fprintf (stderr, _("%s: %s returned with status %d\n"),
Prog, editor, WEXITSTATUS (status));
exit (WEXITSTATUS (status));
} else if (WIFSIGNALED (status)) {
}
if (WIFSIGNALED(status)) {
fprintf (stderr, _("%s: %s killed by signal %d\n"),
Prog, editor, WTERMSIG (status));
exit (1);
} else {
exit (0);
}
exit(0);
}

/* Run child in a new pgrp and make it the foreground pgrp. */
Expand Down Expand Up @@ -379,12 +385,11 @@ vipwedit (const char *file, int (*file_lock) (void), int (*file_unlock) (bool))
sigprocmask(SIG_SETMASK, &omask, NULL);
}

if (-1 == pid) {
if (-1 == pid)
vipwexit (editor, 1, 1);
} else if ( WIFEXITED (status)
&& (WEXITSTATUS (status) != 0)) {
if (WIFEXITED(status) && WEXITSTATUS(status) != 0)
vipwexit (NULL, 0, WEXITSTATUS (status));
} else if (WIFSIGNALED (status)) {
if (WIFSIGNALED(status)) {
fprintf (stderr, _("%s: %s killed by signal %d\n"),
Prog, editor, WTERMSIG(status));
vipwexit (NULL, 0, 1);
Expand Down Expand Up @@ -413,8 +418,10 @@ vipwedit (const char *file, int (*file_lock) (void), int (*file_unlock) (bool))
createedit = false;
#ifdef WITH_TCB
if (tcb_mode) {
f = fopen (fileedit, "r");
if (NULL == f) {
FILE *fe;

fe = fopen(fileedit, "r");
if (NULL == fe) {
vipwexit (_("failed to open scratch file"), errno, 1);
}
if (unlink (fileedit) != 0) {
Expand All @@ -430,11 +437,11 @@ vipwedit (const char *file, int (*file_lock) (void), int (*file_unlock) (bool))
if (to_rename == NULL)
vipwexit (_("aprintf() failed"), errno, 1);

if (create_backup_file (f, to_rename, &st1) != 0) {
if (create_backup_file(fe, to_rename, &st1) != 0) {
free(to_rename);
vipwexit (_("failed to create backup file"), errno, 1);
}
(void) fclose (f);
(void) fclose(fe);
} else {
#endif /* WITH_TCB */
to_rename = fileedit;
Expand Down
Loading