mandoc/mandocdb.c - diff

Return to mandocdb.c CVS log

Up to [cvsweb.bsd.lv] / mandoc

Diff for /mandoc/mandocdb.c between version 1.122 and 1.123

version 1.122, 2014/03/23 12:44:56

version 1.123, 2014/03/26 20:53:36

Line 551 treescan(void)

f = fts_open((char * const *)argv, FTS_LOGICAL, NULL);

if (NULL == f) {

exitcode = (int)MANDOCLEVEL_SYSERR;

say("", NULL);

say("", "&fts_open");

return(0);

}

Line 705 filescan(const char *file)

if (NULL == realpath(file, buf)) {

exitcode = (int)MANDOCLEVEL_BADARG;

say(file, NULL);

say(file, "&realpath");

return;

}

Line 721 filescan(const char *file)

if (-1 == stat(buf, &st)) {

exitcode = (int)MANDOCLEVEL_BADARG;

say(file, NULL);

say(file, "&stat");

return;

} else if ( ! (S_IFREG & st.st_mode)) {

exitcode = (int)MANDOCLEVEL_BADARG;

Line 1124 parse_cat(struct mpage *mpage)

if (NULL == (stream = fopen(mpage->mlinks->file, "r"))) {

if (warnings)

say(mpage->mlinks->file, NULL);

say(mpage->mlinks->file, "&fopen");

return;

}

Line 1881 dbclose(int real)

if ('\0' == *tempfilename) {

if (-1 == rename(MANDOC_DB "~", MANDOC_DB)) {

exitcode = (int)MANDOCLEVEL_SYSERR;

say(MANDOC_DB, "%s", strerror(errno));

say(MANDOC_DB, "&rename");

}

return;

}

Line 1889 dbclose(int real)

switch (child = fork()) {

case (-1):

exitcode = (int)MANDOCLEVEL_SYSERR;

say("fork cmp", "%s", strerror(errno));

say("", "&fork cmp");

return;

case (0):

execlp("cmp", "cmp", "-s",

tempfilename, MANDOC_DB, NULL);

say("exec cmp", "%s", strerror(errno));

say("", "&exec cmp");

exit(0);

default:

break;

}

if (-1 == waitpid(child, &status, 0)) {

exitcode = (int)MANDOCLEVEL_SYSERR;

say("wait cmp", "%s", strerror(errno));

say("", "&wait cmp");

} else if (WIFSIGNALED(status)) {

exitcode = (int)MANDOCLEVEL_SYSERR;

say("cmp", "Died from a signal");

say("", "cmp died from signal %d", WTERMSIG(status));

} else if (WEXITSTATUS(status)) {

exitcode = (int)MANDOCLEVEL_SYSERR;

say(MANDOC_DB,

Line 1915 dbclose(int real)

switch (child = fork()) {

case (-1):

exitcode = (int)MANDOCLEVEL_SYSERR;

say("fork rm", "%s", strerror(errno));

say("", "&fork rm");

return;

case (0):

execlp("rm", "rm", "-rf", tempfilename, NULL);

say("exec rm", "%s", strerror(errno));

say("", "&exec rm");

exit((int)MANDOCLEVEL_SYSERR);

default:

break;

}

if (-1 == waitpid(child, &status, 0)) {

exitcode = (int)MANDOCLEVEL_SYSERR;

say("wait rm", "%s", strerror(errno));

say("", "&wait rm");

} else if (WIFSIGNALED(status) || WEXITSTATUS(status)) {

exitcode = (int)MANDOCLEVEL_SYSERR;

say(tempfilename,

say("", "%s: Cannot remove temporary directory",

"Cannot remove temporary directory");

tempfilename);

}

Line 1979 dbopen(int real)

if (strlcpy(tempfilename, "/tmp/mandocdb.XXXXXX",

sizeof(tempfilename)) >= sizeof(tempfilename)) {

exitcode = (int)MANDOCLEVEL_SYSERR;

say("/tmp/mandocdb.XXXXXX", "Filename too long");

say("", "/tmp/mandocdb.XXXXXX: Filename too long");

return(0);

}

if (NULL == mkdtemp(tempfilename)) {

exitcode = (int)MANDOCLEVEL_SYSERR;

say(tempfilename, "%s", strerror(errno));

say("", "&%s", tempfilename);

return(0);

}

if (strlcat(tempfilename, "/" MANDOC_DB,

sizeof(tempfilename)) >= sizeof(tempfilename)) {

exitcode = (int)MANDOCLEVEL_SYSERR;

say(tempfilename, "Filename too long");

say("", "%s/" MANDOC_DB ": Filename too long",

tempfilename);

return(0);

}

rc = sqlite3_open_v2(tempfilename, &db, ofl, NULL);

if (SQLITE_OK != rc) {

exitcode = (int)MANDOCLEVEL_SYSERR;

say(tempfilename, "%s", sqlite3_errmsg(db));

say("", "%s: %s", tempfilename, sqlite3_errmsg(db));

return(0);

}

Line 2093 set_basedir(const char *targetdir)

Line 2094 set_basedir(const char *targetdir)

if (NULL == getcwd(startdir, PATH_MAX)) {

exitcode = (int)MANDOCLEVEL_SYSERR;

if (NULL != targetdir)

say(".", NULL);

say("", "&getcwd");

return(0);

}

if (-1 == (fd = open(startdir, O_RDONLY, 0))) {

exitcode = (int)MANDOCLEVEL_SYSERR;

say(startdir, NULL);

say("", "&open %s", startdir);

return(0);

}

if (NULL == targetdir)

Line 2110 set_basedir(const char *targetdir)

Line 2111 set_basedir(const char *targetdir)

close(fd);

basedir[0] = '\0';

exitcode = (int)MANDOCLEVEL_SYSERR;

say(startdir, NULL);

say("", "&chdir %s", startdir);

return(0);

}

if (NULL == targetdir) {

Line 2121 set_basedir(const char *targetdir)

Line 2122 set_basedir(const char *targetdir)

if (NULL == realpath(targetdir, basedir)) {

basedir[0] = '\0';

exitcode = (int)MANDOCLEVEL_BADARG;

say(targetdir, NULL);

say("", "&%s: realpath", targetdir);

return(0);

} else if (-1 == chdir(basedir)) {

exitcode = (int)MANDOCLEVEL_BADARG;

say("", NULL);

say("", "&chdir");

return(0);

}

return(1);

Line 2135 static void

Line 2136 static void

say(const char *file, const char *format, ...)

{

va_list ap;

int use_errno;

if ('\0' != *basedir)

fprintf(stderr, "%s", basedir);

Line 2142 say(const char *file, const char *format, ...)

Line 2144 say(const char *file, const char *format, ...)

fputs("//", stderr);

if ('\0' != *file)

fprintf(stderr, "%s", file);

fputs(": ", stderr);

if (NULL == format) {

use_errno = 1;

perror(NULL);

if (NULL != format) {

return;

switch (*format) {

case ('&'):

format++;

break;

case ('\0'):

format = NULL;

break;

default:

use_errno = 0;

break;

}

if (NULL != format) {

va_start(ap, format);

if ('\0' != *basedir || '\0' != *file)

vfprintf(stderr, format, ap);

fputs(": ", stderr);

va_end(ap);

va_start(ap, format);

vfprintf(stderr, format, ap);

fputc('\n', stderr);

va_end(ap);

}

if (use_errno) {

if ('\0' != *basedir || '\0' != *file || NULL != format)

fputs(": ", stderr);

perror(NULL);

} else

fputc('\n', stderr);

}

CVSweb