Changeset c3acb0b

Timestamp:

Dec 23, 2003, 4:38:44 PM (19 years ago)

Author:

James M. Kretchmar <kretch@mit.edu>

Branches:

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

Children:

ba9f236

Parents:

8b16467

Message:

If the config exists but is not readable, print an error before exiting

Files:

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

ChangeLog

@@ -20 +20 @@
         Status bar can now read AWAY, Z-AWAY or A-AWAY.
         Changed C-n to scroll down just a line in popless
+        If the config exists but is not readable, print an error before
+          exiting
         
 2.1.1-pre-1

owl.c

@@ -276 +276 @@
   if (perlerr) {
     endwin();
-    fprintf(stderr, "\nError parsing configfile: %s\n", perlerr);
+    owl_function_error("Error parsing configfile\n");
+    fprintf(stderr, "\nError parsing configfile.  Possibly exists but not readable. (%s)\n", perlerr);
+    fflush(stderr);
+    printf("\nError parsing configfile.  Possibly exists but not readable. (%s)\n", perlerr);
+    fflush(stdout);
     exit(1);
   }

perlconfig.c

@@ -15 +15 @@
 extern XS(boot_owl);
 
-static void owl_perl_xs_init(pTHX) {
+static void owl_perl_xs_init(pTHX)
+{
   char *file = __FILE__;
   dXSUB_SYS;
@@ -23 +24 @@
 }
 
-SV *owl_perlconfig_message2hashref(owl_message *m) { /*noproto*/
+SV *owl_perlconfig_message2hashref(owl_message *m)  /*noproto*/
+{
   HV *h;
   SV *hr;
@@ -84 +86 @@
 
 
-SV *owl_perlconfig_curmessage2hashref(void) { /*noproto*/
+SV *owl_perlconfig_curmessage2hashref(void) /*noproto*/
+{
   int curmsg;
   owl_view *v;
@@ -98 +101 @@
 /* Calls in a scalar context, passing it a hash reference.
    If return value is non-null, caller must free. */
-char *owl_perlconfig_call_with_message(char *subname, owl_message *m) {
+char *owl_perlconfig_call_with_message(char *subname, owl_message *m)
+{
   dSP ;
   int count, len;
@@ -146 +150 @@
 }
 
-char *owl_perlconfig_readconfig(char *file) {
+char *owl_perlconfig_readconfig(char *file)
+{
   int ret;
   PerlInterpreter *p;
@@ -233 +238 @@
 
 /* returns 0 on success */
-int owl_perlconfig_get_hashkeys(char *hashname, owl_list *l) {
+int owl_perlconfig_get_hashkeys(char *hashname, owl_list *l)
+{
   HV *hv;
   HE *he;
@@ -253 +259 @@
 
 /* caller is responsible for freeing returned string */
-char *owl_perlconfig_execute(char *line) {
+char *owl_perlconfig_execute(char *line)
+{
   STRLEN len;
   SV *response;
@@ -281 +288 @@
 }
 
-char *owl_perlconfig_getmsg(owl_message *m, int mode, char *subname) { 
+char *owl_perlconfig_getmsg(owl_message *m, int mode, char *subname)
+{ 
   /* if mode==1 we are doing message formatting.  The returned
    * formatted message needs to be freed by the caller.