Changeset e1c4636 for logging.c

Timestamp:

Jul 9, 2002, 12:04:35 AM (22 years ago)

Author:

Erik Nygren <nygren@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:

2c8a07c

Parents:

10b866d

Message:

* Added owl::send_zwrite(command, message) to the perl glue
         to allow for the direct sending of multi-line messages.
         For example:  owl::send_zwrite("-c foo -i bar", "hello");
* Reverted attempted fix for the pagedown problem
         which just made things worse.
* Changed owl_fmtext_print_plain to return an alloc'd string to
         avoid buffer overrun risks.
* Added owl::ztext_stylestrip("...") function to perlglue
          which returns the ztext with formatting stripped out.
* Added colorztext variable which can be used to disable @color()
          strings arriving in messages after it is set.
          (Currently, changing its value won't reformat messages).
* Outgoing zephyr logging now obeys the logpath variable.
* The '~' character in logpath and classlogpath now gets
          replaced with the user's home directory.

File:

• logging.c (modified) (6 diffs)

logging.c

@@ -9 +9 @@
 void owl_log_outgoing(char *to, char *text) {
   FILE *file;
-  char filename[MAXPATHLEN];
+  char filename[MAXPATHLEN], *logpath;
   char *tobuff, *ptr;
 
@@ -21 +21 @@
   }
 
-  sprintf(filename, "%s/zlog/people/%s", owl_global_get_homedir(&g), tobuff);
+  /* expand ~ in path names */
+  logpath = owl_util_substitute(owl_global_get_logpath(&g), "~", 
+                                owl_global_get_homedir(&g));
+
+  snprintf(filename, MAXPATHLEN, "%s/%s", logpath, tobuff);
   file=fopen(filename, "a");
   if (!file) {
     owl_function_makemsg("Unable to open file for outgoing logging");
+    owl_free(logpath);
     return;
   }
@@ -33 +38 @@
   fclose(file);
 
-  sprintf(filename, "%s/zlog/people/all", owl_global_get_homedir(&g));
+  snprintf(filename, MAXPATHLEN, "%s/all", logpath);
+  owl_free(logpath);
   file=fopen(filename, "a");
   if (!file) {
@@ -50 +56 @@
 void owl_log_incoming(owl_message *m) {
   FILE *file, *allfile;
-  char filename[MAXPATHLEN], allfilename[MAXPATHLEN];
+  char filename[MAXPATHLEN], allfilename[MAXPATHLEN], *logpath;
   char *frombuff, *ptr, *from, *buff, *tmp;
   int len, ch, i, personal;
@@ -86 +92 @@
 
   for (i=0; i<len; i++) {
-    if (frombuff[i]<'!' || frombuff[i]>'~') from="weird";
+    if (frombuff[i]<'!' || frombuff[i]>='~') from="weird";
   }
 
@@ -95 +101 @@
   }
 
-  /* create the filename */
+  /* create the filename (expanding ~ in path names) */
   if (personal) {
-    sprintf(filename, "%s/%s", owl_global_get_logpath(&g), from);
-    sprintf(allfilename, "%s/all", owl_global_get_logpath(&g));
+    logpath = owl_util_substitute(owl_global_get_logpath(&g), "~", 
+                                  owl_global_get_homedir(&g));
+    snprintf(filename, MAXPATHLEN, "%s/%s", logpath, from);
+    snprintf(allfilename, MAXPATHLEN, "%s/all", logpath);
+
   } else {
-    sprintf(filename, "%s/%s", owl_global_get_classlogpath(&g), from);
+    logpath = owl_util_substitute(owl_global_get_classlogpath(&g), "~", 
+                                owl_global_get_homedir(&g));
+
+    snprintf(filename, MAXPATHLEN, "%s/%s", logpath, from);
   }
+  owl_free(logpath);
   
   file=fopen(filename, "a");