Changeset 56330ff for zwrite.c

Timestamp:

Aug 25, 2002, 3:02:14 PM (22 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:

c01e477

Parents:

4b464a4

Message:

Moved zsig generation to the zwrite object
Print the zsig used for outgoing messages

File:

• zwrite.c (modified) (7 diffs)

zwrite.c

@@ -1 +1 @@
 #include <string.h>
+#include <pwd.h>
+#include <sys/types.h>
+#include <unistd.h>
 #include "owl.h"
 
@@ -17 +20 @@
   int argc, badargs, myargc;
   char **argv, **myargv;
+  char *zsigexec, *zsigowlvar, *zsigzvar, *ptr;
+  struct passwd *pw;
 
   badargs=0;
@@ -25 +30 @@
   strcpy(z->inst, "personal");
   strcpy(z->opcode, "");
+  z->zsig=owl_strdup("");
   z->cc=0;
   z->noping=0;
@@ -103 +109 @@
   }
 
+  /* set a zsig */
+  zsigexec = owl_global_get_zsig_exec(&g);
+  zsigowlvar = owl_global_get_zsig(&g);
+  zsigzvar = ZGetVariable("zwrite-signature");
+
+  if (zsigowlvar && *zsigowlvar) {
+    owl_free(z->zsig);
+    z->zsig=strdup(zsigowlvar);
+  } else if (zsigexec && *zsigexec) {
+    FILE *file;
+    char buff[LINE];
+
+    file=popen(zsigexec, "r");
+    if (!file) {
+      if (zsigzvar && *zsigzvar) {
+        owl_free(z->zsig);
+        z->zsig=owl_strdup(zsigzvar);
+      }
+    } else {
+      owl_free(z->zsig);
+      z->zsig=owl_malloc(LINE);
+      strcpy(z->zsig, "");
+      while (fgets(buff, LINE, file)) { /* wrong sizing */
+        strcat(z->zsig, buff);
+      }
+      pclose(file);
+      if (z->zsig[strlen(z->zsig)-1]=='\n') {
+        z->zsig[strlen(z->zsig)-1]='\0';
+      }
+    }
+  } else if (zsigzvar) {
+    owl_free(z->zsig);
+    z->zsig=owl_strdup(zsigzvar);
+  } else if (((pw=getpwuid(getuid()))!=NULL) && (pw->pw_gecos)) {
+    owl_free(z->zsig);
+    z->zsig=strdup(pw->pw_gecos);
+    ptr=strchr(z->zsig, ',');
+    if (ptr) {
+      ptr[0]='\0';
+    }
+  }
+
   return(0);
 }
@@ -160 +208 @@
       }
       if (z->cc) {
-        send_zephyr(z->opcode, NULL, z->class, z->inst, to, tmpmsg);
+        send_zephyr(z->opcode, z->zsig, z->class, z->inst, to, tmpmsg);
       } else {
-        send_zephyr(z->opcode, NULL, z->class, z->inst, to, msg);
+        send_zephyr(z->opcode, z->zsig, z->class, z->inst, to, msg);
       }
     }
@@ -190 +238 @@
 }
 
+char *owl_zwrite_get_zsig(owl_zwrite *z) {
+  return(z->zsig);
+}
+
 void owl_zwrite_get_recipstr(owl_zwrite *z, char *buff) {
   int i, j;
@@ -225 +277 @@
 void owl_zwrite_free(owl_zwrite *z) {
   owl_list_free_all(&(z->recips), &owl_free);
-}
+  owl_free(z->zsig);
+}