[src/trunk]: src/usr.sbin/makemandb PR/51039: Abhinav Upadhyay: Check for ret...

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/17bff171569a
branches:  trunk
changeset: 814868:17bff171569a
user:      christos <christos%NetBSD.org@localhost>
date:      Wed Apr 13 01:40:09 2016 +0000

description:
PR/51039: Abhinav Upadhyay: Check for return value of chdir(2)

diffstat:

 usr.sbin/makemandb/makemandb.c |  16 ++++++++++++----
 1 files changed, 12 insertions(+), 4 deletions(-)

diffs (45 lines):

diff -r 6a252ca86617 -r 17bff171569a usr.sbin/makemandb/makemandb.c
--- a/usr.sbin/makemandb/makemandb.c    Wed Apr 13 01:37:50 2016 +0000
+++ b/usr.sbin/makemandb/makemandb.c    Wed Apr 13 01:40:09 2016 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: makemandb.c,v 1.34 2016/04/13 01:32:00 christos Exp $  */
+/*     $NetBSD: makemandb.c,v 1.35 2016/04/13 01:40:09 christos Exp $  */
 /*
  * Copyright (c) 2011 Abhinav Upadhyay <er.abhinav.upadhyay%gmail.com@localhost>
  * Copyright (c) 2011 Kristaps Dzonsons <kristaps%bsd.lv@localhost>
@@ -17,7 +17,7 @@
  */
 
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: makemandb.c,v 1.34 2016/04/13 01:32:00 christos Exp $");
+__RCSID("$NetBSD: makemandb.c,v 1.35 2016/04/13 01:40:09 christos Exp $");
 
 #include <sys/stat.h>
 #include <sys/types.h>
@@ -843,16 +843,24 @@
                         * This means is either a new file or an updated file.
                         * We should go ahead with parsing.
                         */
+                       if (chdir(parent) == -1) {
+                               if (mflags.verbosity)
+                                       warn("chdir failed for `%s', could "
+                                           "not index `%s'", parent, file);
+                               err_count++;
+                               free(md5sum);
+                               continue;
+                       }
+
                        if (mflags.verbosity == 2)
                                printf("Parsing: %s\n", file);
                        rec->md5_hash = md5sum;
                        rec->file_path = estrdup(file);
                        // file_path is freed by insert_into_db itself.
-                       chdir(parent);
                        begin_parse(file, mp, rec, buf, buflen);
                        if (insert_into_db(db, rec) < 0) {
                                if (mflags.verbosity)
-                                       warnx("Error in indexing %s", file);
+                                       warnx("Error in indexing `%s'", file);
                                err_count++;
                        } else {
                                new_count++;