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

bk: 4e3af0509wVVdrngYfdljydrQy7xIQ

diff --git a/ChangeLog b/ChangeLog
index d9a801b5df79e0e228b450e4db5b50fd143a4d4e..fd6395c3d54072790842069b72b41c5080d2e0e8 100644 (file)
--- 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 bd06b1e1a851069aed597e20fc77f158774a8941..bb6adf63bc0f3a695106d3f462ad29f9effd66ca 100644 (file)
--- 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),