From: Harlan Stenn <stenn@ntp.org>
Date: Thu, 4 Aug 2011 19:17:36 +0000 (-0400)
Subject: libopts/file.c fix from Bruce Korb (arg-type=file)
X-Git-Tag: NTP_4_2_7P201~3^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=40b0cc0832caa40f57a050cd738f472e263756a1;p=thirdparty%2Fntp.git

libopts/file.c fix from Bruce Korb (arg-type=file)

bk: 4e3af0509wVVdrngYfdljydrQy7xIQ
---

diff --git a/ChangeLog b/ChangeLog
index d9a801b5d..fd6395c3d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+---
+
+* libopts/file.c fix from Bruce Korb (arg-type=file).
+
 ---
 (4.2.6p4-RC2) 2011/08/04 Released by Harlan Stenn <stenn@ntp.org>
 
diff --git a/sntp/libopts/file.c b/sntp/libopts/file.c
index bd06b1e1a..bb6adf63b 100644
--- a/sntp/libopts/file.c
+++ b/sntp/libopts/file.c
@@ -89,8 +89,10 @@ optionFileCheck(tOptions* pOpts, tOptDesc* pOD,
         case FTYPE_MODE_MAY_EXIST:
         {
             char * p = strrchr(pOD->optArg.argString, DIRCH);
-            if (p != NULL)
-                *p = NUL;
+            if (p == NULL)
+                break; /* assume "." always exists. */
+
+            *p = NUL;
             if (  (stat(pOD->optArg.argString, &sb) != 0)
                || (errno = EINVAL, ! S_ISDIR(sb.st_mode)) ){
                 fprintf(stderr, zFSOptError, errno, strerror(errno),