version 1.249, 2017/05/05 15:17:32 |
version 1.254, 2017/08/26 12:59:17 |
Line 420 mandocdb(int argc, char *argv[]) |
|
Line 420 mandocdb(int argc, char *argv[]) |
|
|
|
exitcode = (int)MANDOCLEVEL_OK; |
exitcode = (int)MANDOCLEVEL_OK; |
mchars_alloc(); |
mchars_alloc(); |
mp = mparse_alloc(mparse_options, MANDOCLEVEL_BADARG, NULL, NULL); |
mp = mparse_alloc(mparse_options, MANDOCERR_MAX, NULL, |
|
MANDOC_OS_OTHER, NULL); |
mandoc_ohash_init(&mpages, 6, offsetof(struct mpage, inodev)); |
mandoc_ohash_init(&mpages, 6, offsetof(struct mpage, inodev)); |
mandoc_ohash_init(&mlinks, 6, offsetof(struct mlink, file)); |
mandoc_ohash_init(&mlinks, 6, offsetof(struct mlink, file)); |
|
|
Line 2118 dbprune(struct dba *dba) |
|
Line 2119 dbprune(struct dba *dba) |
|
static void |
static void |
dbwrite(struct dba *dba) |
dbwrite(struct dba *dba) |
{ |
{ |
char tfn[32]; |
char tfn[33]; |
int status; |
int status; |
pid_t child; |
pid_t child; |
|
|
|
/* |
|
* Do not write empty databases, and delete existing ones |
|
* when makewhatis -u causes them to become empty. |
|
*/ |
|
|
|
dba_array_start(dba->pages); |
|
if (dba_array_next(dba->pages) == NULL) { |
|
if (unlink(MANDOC_DB) == -1 && errno != ENOENT) |
|
say(MANDOC_DB, "&unlink"); |
|
return; |
|
} |
|
|
|
/* |
|
* Build the database in a temporary file, |
|
* then atomically move it into place. |
|
*/ |
|
|
if (dba_write(MANDOC_DB "~", dba) != -1) { |
if (dba_write(MANDOC_DB "~", dba) != -1) { |
if (rename(MANDOC_DB "~", MANDOC_DB) == -1) { |
if (rename(MANDOC_DB "~", MANDOC_DB) == -1) { |
exitcode = (int)MANDOCLEVEL_SYSERR; |
exitcode = (int)MANDOCLEVEL_SYSERR; |
Line 2131 dbwrite(struct dba *dba) |
|
Line 2149 dbwrite(struct dba *dba) |
|
return; |
return; |
} |
} |
|
|
|
/* |
|
* We lack write permission and cannot replace the database |
|
* file, but let's at least check whether the data changed. |
|
*/ |
|
|
(void)strlcpy(tfn, "/tmp/mandocdb.XXXXXXXX", sizeof(tfn)); |
(void)strlcpy(tfn, "/tmp/mandocdb.XXXXXXXX", sizeof(tfn)); |
if (mkdtemp(tfn) == NULL) { |
if (mkdtemp(tfn) == NULL) { |
exitcode = (int)MANDOCLEVEL_SYSERR; |
exitcode = (int)MANDOCLEVEL_SYSERR; |
Line 2170 dbwrite(struct dba *dba) |
|
Line 2193 dbwrite(struct dba *dba) |
|
} |
} |
|
|
out: |
out: |
|
unlink(tfn); |
*strrchr(tfn, '/') = '\0'; |
*strrchr(tfn, '/') = '\0'; |
switch (child = fork()) { |
rmdir(tfn); |
case -1: |
|
exitcode = (int)MANDOCLEVEL_SYSERR; |
|
say("", "&fork rm"); |
|
return; |
|
case 0: |
|
execlp("rm", "rm", "-rf", tfn, (char *)NULL); |
|
say("", "&exec rm"); |
|
exit((int)MANDOCLEVEL_SYSERR); |
|
default: |
|
break; |
|
} |
|
if (waitpid(child, &status, 0) == -1) { |
|
exitcode = (int)MANDOCLEVEL_SYSERR; |
|
say("", "&wait rm"); |
|
} else if (WIFSIGNALED(status) || WEXITSTATUS(status)) { |
|
exitcode = (int)MANDOCLEVEL_SYSERR; |
|
say("", "%s: Cannot remove temporary directory", tfn); |
|
} |
|
} |
} |
|
|
static int |
static int |