Changeset 4e0f545

Timestamp:

Jan 3, 2005, 4:53:33 PM (20 years ago)

Author:

James M. Kretchmar <kretch@mit.edu>

Branches:

master, barnowl_perlaim, debian, owl, release-1.10, release-1.4, release-1.5, release-1.6, release-1.7, release-1.8, release-1.9

Children:

95474d7

Parents:

aa1bbf6

Message:

Print Better error message if startup fails due to unreadable .owlconf [BZ 57]

Files:

• ChangeLog (modified) (1 diff)
• owl.c (modified) (1 diff)
• perlconfig.c (modified) (4 diffs)

ChangeLog

@@ -1 +1 @@
 $Id$
 
-2.1.11
+2.1.11-pre-1
         Don't crash doing zlocate with bad tickets. [BZ 12]
         Metion the path for the owlconf in intro.txt [BZ 54]
+        Print Better error message if startup fails due to unreadable
+           .owlconf [BZ 57]
 
 2.1.10

owl.c

@@ -316 +316 @@
   if (perlerr) {
     endwin();
-    owl_function_error("Error parsing configfile\n");
-    fprintf(stderr, "\nError parsing configfile. (%s)\n", perlerr);
+    owl_function_error("Error parsing configfile: %s\n", perlerr);
+    fprintf(stderr, "\nError parsing configfile: %s\n", perlerr);
     fflush(stderr);
-    printf("\nError parsing configfile. (%s)\n", perlerr);
+    printf("\nError parsing configfile: %s\n", perlerr);
     fflush(stdout);
     exit(1);

perlconfig.c

@@ -152 +152 @@
 char *owl_perlconfig_readconfig(char *file)
 {
-  int ret;
+  int ret, fd;
   PerlInterpreter *p;
   char filename[1024];
   char *embedding[5];
+  char *err;
   struct stat statbuff;
 
@@ -174 +175 @@
   owl_global_set_no_have_config(&g);
 
+  /* Before we let perl have at it, we'll do our own checks on the the
+   *  file to see if it's present, readnable etc.
+   */
+
+  /* Not present, start without it */
   ret=stat(filename, &statbuff);
   if (ret) {
-    return NULL;
-  }
+    return(NULL);
+  }
+
+  /* present, but stat thinks it's unreadable */
+  if (! (statbuff.st_mode & S_IREAD)) {
+    return(owl_sprintf("%s present but not readable", filename));
+  }
+
+  /* can we open it? */
+  fd=open(filename, O_RDONLY);
+  if (fd==-1) {
+    return(owl_sprintf("could not open %s for reading", filename));
+  }
+  close(fd);
 
   ret=perl_parse(p, owl_perl_xs_init, 2, embedding, NULL);
   if (ret || SvTRUE(ERRSV)) {
     STRLEN n_a;
-    char *err;
-    err = owl_strdup(SvPV(ERRSV, n_a));
-    sv_setsv (ERRSV, &PL_sv_undef);     /* and clear the error */
-    return err;
+    err=owl_strdup(SvPV(ERRSV, n_a));
+    sv_setsv(ERRSV, &PL_sv_undef);     /* and clear the error */
+    return(err);
   }
 
@@ -191 +208 @@
   if (ret || SvTRUE(ERRSV)) {
     STRLEN n_a;
-    char *err;
-    err = owl_strdup(SvPV(ERRSV, n_a));
-    sv_setsv (ERRSV, &PL_sv_undef);     /* and clear the error */
-    return err;
+    err=owl_strdup(SvPV(ERRSV, n_a));
+    sv_setsv(ERRSV, &PL_sv_undef);     /* and clear the error */
+    return(err);
   }
 
@@ -217 +233 @@
   if (SvTRUE(ERRSV)) {
     STRLEN n_a;
-    char *err;
-    err = owl_strdup(SvPV(ERRSV, n_a));
+    err=owl_strdup(SvPV(ERRSV, n_a));
     sv_setsv (ERRSV, &PL_sv_undef);     /* and clear the error */
-    return err;
+    return(err);
   }