* Red Hat Bug #253342: inc.c, utils.c, utils.h: When inc is run with the

-silent flag, don't exit(1) for no apparent reason.

diff --git a/ChangeLog b/ChangeLog
index 89de2f8d3e7ffa44192e81f9bb0c20ae93cd071f..1412bf304487006e19258545886070986a7ea1ff 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-08-21  Josh Bressers <josh@bress.net>
+
+       * Red Hat Bug #253342: inc.c, utils.c, utils.h: When inc is run with
+       the -silent flag, don't exit(1) for no apparent reason.
+
 2007-03-12  Peter Maydell <pmaydell@chiark.greenend.org.uk>
 
        * bug #18630, #18631, #18632, #18634: various patches from

diff --git a/h/utils.h b/h/utils.h
index 92fdabac40dbb534a43ada73145c25561ee11108..9c19e924ec246f0bd79c9c364a20d15cdcc0b6ff 100644 (file)
--- a/h/utils.h
+++ b/h/utils.h
@@ -9,6 +9,7 @@ void *mh_xmalloc(size_t);
 void *mh_xrealloc(void *, size_t);
 char *pwd(void);
 char *add(char *, char *);
+int folder_exists(char *);
 void create_folder(char *, int, void (*)());
 int num_digits(int);
 

diff --git a/sbr/utils.c b/sbr/utils.c
index 64df443b22455688012af8890d7190d104783515..87d368dde46d81b3ae7463741894d188e84837a9 100644 (file)
--- a/sbr/utils.c
+++ b/sbr/utils.c
@@ -120,6 +120,29 @@ add (char *s2, char *s1)
     return cp;
 }
 
+/*
+ * folder_exists
+ *      Check to see if a folder exists.
+ */
+int folder_exists(char *folder)
+{
+    struct stat st;
+    int exists = 0;
+
+    if (stat (folder, &st) == -1) {
+        /* The folder either doesn't exist, or we hit an error.  Either way
+         * return a failure.
+         */
+        exists = 0;
+    } else {
+        /* We can see a folder with the right name */
+        exists = 1;
+    }
+
+    return exists;
+}
+
+
 /*
  * create_folder
  *      Check to see if a folder exists, if not, prompt the user to create

diff --git a/uip/inc.c b/uip/inc.c
index a2ecb4406c987053ee428a4f600d702cf88ff0d9..45036f5baa0877b399fdcbdda930f76939e0ddc4 100644 (file)
--- a/uip/inc.c
+++ b/uip/inc.c
@@ -563,10 +563,15 @@ main (int argc, char **argv)
     if ((maildir_copy = strdup(maildir)) == (char *)0)
         adios (maildir, "error allocating memory to copy maildir");
 
-    if (noisy)
-        create_folder(maildir, 0, done);
-    else
-        done (1);
+    if (!folder_exists(maildir)) {
+        /* If the folder doesn't exist, and we're given the -silent flag,
+         * just fail.
+         */
+        if (noisy)
+            create_folder(maildir, 0, done);
+        else
+            done (1);
+    }
 
     if (chdir (maildir) == NOTOK)
        adios (maildir, "unable to change directory to");