X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/c6f2d14d9c38345075629af3487c2de491584ca1..eae4e80fddb67ed353f32a54c9eeed1c1527e5a9:/sbr/makedir.c diff --git a/sbr/makedir.c b/sbr/makedir.c index a905f331..04e5d779 100644 --- a/sbr/makedir.c +++ b/sbr/makedir.c @@ -1,6 +1,4 @@ - -/* - * makedir.c -- make a directory +/* makedir.c -- make a directory * * This code is Copyright (c) 2002, by the authors of nmh. See the * COPYRIGHT file in the root directory of the nmh distribution for @@ -12,6 +10,7 @@ */ #include +#include "makedir.h" #include int @@ -19,7 +18,6 @@ makedir (const char *dir) { char path[PATH_MAX]; char* folder_perms_ASCII; - int had_an_error = 0; mode_t folder_perms, saved_umask; char* c; @@ -44,17 +42,18 @@ makedir (const char *dir) c = strncpy(path, dir, sizeof(path)); + bool had_an_error = false; while (!had_an_error && (c = strchr((c + 1), '/')) != NULL) { - *c = (char)0; + *c = '\0'; if (access(path, X_OK)) { if (errno != ENOENT){ advise (dir, "unable to create directory"); - had_an_error = 1; + had_an_error = true; } /* Create an outer directory. */ if (mkdir(path, folder_perms)) { advise (dir, "unable to create directory"); - had_an_error = 1; + had_an_error = true; } } *c = '/'; @@ -65,7 +64,7 @@ makedir (const char *dir) asked to create. */ if (mkdir (dir, folder_perms) == -1) { advise (dir, "unable to create directory"); - had_an_error = 1; + had_an_error = true; } } @@ -73,6 +72,5 @@ makedir (const char *dir) if (had_an_error) return 0; /* opposite of UNIX error return convention */ - else - return 1; + return 1; }