Adding ability to ignore non-existent files and directories

3 files changed, 34 insertions, 15 deletions

diff --git a/src/securecoreutils.c b/src/securecoreutils.c
index 75cbdd0..233694e 100644
--- a/src/securecoreutils.c
+++ b/src/securecoreutils.c
@@ -289,7 +289,7 @@ const char * scu_basename(const char * path)
 
 
 /// checks paths
-int scu_pathcheck(const char * path, int isdir)
+int scu_pathcheck(const char * path, int opts)
 {
    int            c;
    size_t         s;
@@ -320,13 +320,19 @@ int scu_pathcheck(const char * path, int isdir)
 
    // verify file is not a symbolic link
    if ((c = lstat(path, &sb)) == -1)
-      return(SCU_ERRNO);
-   if (isdir == 0)
-      if ((sb.st_mode & S_IFMT) != S_IFREG)
-         return(SCU_EFILE);
-   if (isdir != 0)
-      if ((sb.st_mode & S_IFMT) != S_IFDIR)
-         return(SCU_EDIR);
+   {
+      if ( ((opts & SCU_ONOTEXISTS) == 0) || (errno != ENOENT) )
+         return(SCU_ERRNO);
+   }
+   else
+   {
+      if ((opts & SCU_ODIR) == 0)
+         if ((sb.st_mode & S_IFMT) != S_IFREG)
+            return(SCU_EFILE);
+      if ((opts & SCU_ODIR) != 0)
+         if ((sb.st_mode & S_IFMT) != S_IFDIR)
+            return(SCU_EDIR);
+   };
 
    // check path for symlinks
    if ((str = strdup(path)) == NULL)
@@ -339,7 +345,9 @@ int scu_pathcheck(const char * path, int isdir)
       if ((c = lstat(str, &sb)) == -1)
       {
          free(str);
-         return(SCU_ERRNO);
+         if ( ((opts & SCU_ONOTEXISTS) == 0) || (errno != ENOENT) )
+            return(SCU_ERRNO);
+         return(0);
       };
       if ((sb.st_mode & S_IFMT) == S_IFLNK)
       {
diff --git a/src/securecoreutils.h b/src/securecoreutils.h
index 694d911..72422b0 100644
--- a/src/securecoreutils.h
+++ b/src/securecoreutils.h
@@ -113,6 +113,11 @@
 #define SCU_EDIR     5
 
 
+#define SCU_ONONE       0
+#define SCU_ODIR        1
+#define SCU_ONOTEXISTS  2
+
+
 //////////////////
 //              //
 //  Data Types  //
@@ -157,7 +162,7 @@ struct scu_widget
 #endif
 
 /// checks paths
-int scu_pathcheck(const char * path, int isdir);
+int scu_pathcheck(const char * path, int opts);
 
 /// Displays secure core utils wrapper usage
 void scu_usage(scu_config * cnf);
diff --git a/src/widget-pathcheck.c b/src/widget-pathcheck.c
index 77d670f..9c094cb 100644
--- a/src/widget-pathcheck.c
+++ b/src/widget-pathcheck.c
@@ -72,13 +72,14 @@ int scu_widget_pathcheck(scu_config * cnf)
    int            c;
    int            opt_index;
    int            rc;
-   int            isdir;
+   int            opts;
 
    // getopt options
-   static char   short_opt[] = "+dhqVv";
+   static char   short_opt[] = "+dihqVv";
    static struct option long_opt[] =
    {
       {"help",             no_argument,       NULL, 'h' },
+      {"ignore",           no_argument,       NULL, 'i' },
       {"quiet",            no_argument,       NULL, 'q' },
       {"silent",           no_argument,       NULL, 'q' },
       {"version",          no_argument,       NULL, 'V' },
@@ -90,7 +91,7 @@ int scu_widget_pathcheck(scu_config * cnf)
    assert(cnf != NULL);
    cnf->short_opt = short_opt;
 
-   isdir = 0;
+   opts = 0;
 
    while((c = getopt_long(cnf->argc, cnf->argv, short_opt, long_opt, &opt_index)) != -1)
    {
@@ -101,7 +102,11 @@ int scu_widget_pathcheck(scu_config * cnf)
          break;
 
          case 'd':
-         isdir = 1;
+         opts |= SCU_ODIR;
+         break;
+
+         case 'i':
+         opts |= SCU_ONOTEXISTS;
          break;
 
          case 'h':
@@ -157,7 +162,7 @@ int scu_widget_pathcheck(scu_config * cnf)
       return(1);
    };
 
-   if ((rc = scu_pathcheck(cnf->argv[optind], isdir)) != 0)
+   if ((rc = scu_pathcheck(cnf->argv[optind], opts)) != 0)
    {
       if (!(cnf->quiet))
          fprintf(stderr, "%s: %s: %s\n", PROGRAM_NAME, cnf->widget->name, scu_strerror(rc));
@@ -174,6 +179,7 @@ void scu_widget_pathcheck_usage(scu_config * cnf)
    printf("\n");
    scu_usage_options(cnf);
    printf("  -d, --directory           check path for directory instead of file\n");
+   printf("  -i, --ignore              ignore non-existent files and directories\n");
    printf("\n");
    scu_usage_restrictions();
    printf("\n");