Changeset 56330ff for zephyr.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:

• zephyr.c (modified) (3 diffs)

zephyr.c

@@ -6 +6 @@
 #include <zephyr/zephyr.h>
 #include <com_err.h>
-#include <pwd.h>
 #include "owl.h"
 
@@ -259 +258 @@
   int ret;
   ZNotice_t notice;
-  char *ptr;
-  struct passwd *pw;
-  char zsigtmp[LINE];
-  char *zsigexec, *zsigowlvar, *zsigzvar;
-  
-  zsigexec = owl_global_get_zsig_exec(&g);
-  zsigowlvar = owl_global_get_zsig(&g);
-  zsigzvar = ZGetVariable("zwrite-signature");
-
-  if (zsig) {
-    strcpy(zsigtmp, zsig);
-  } else if (zsigowlvar && *zsigowlvar) {
-    strncpy(zsigtmp, zsigowlvar, LINE);
-  } else if (zsigexec && *zsigexec) {
-    FILE *file;
-    char buff[LINE];
-    strcpy(zsigtmp, "");
-    file=popen(zsigexec, "r");
-    if (!file) {
-      if (zsigzvar && *zsigzvar) {
-        strncpy(zsigtmp, zsigzvar, LINE);
-      }
-    } else {
-      while (fgets(buff, LINE, file)) { /* wrong sizing */
-        strcat(zsigtmp, buff);
-      }
-      pclose(file);
-      if (zsigtmp[strlen(zsigtmp)-1]=='\n') {
-        zsigtmp[strlen(zsigtmp)-1]='\0';
-      }
-    }
-  } else if (zsigzvar) {
-    strncpy(zsigtmp, zsigzvar, LINE);
-  } else if (((pw=getpwuid(getuid()))!=NULL) && (pw->pw_gecos)) {
-    strncpy(zsigtmp, pw->pw_gecos, LINE);
-    ptr=strchr(zsigtmp, ',');
-    if (ptr) {
-      ptr[0]='\0';
-    }
-  } else {
-    strcpy(zsigtmp, "");
-  }
     
   memset(&notice, 0, sizeof(notice));
@@ -317 +274 @@
   if (opcode) notice.z_opcode=opcode;
 
-  notice.z_message_len=strlen(zsigtmp)+1+strlen(message);
+  notice.z_message_len=strlen(zsig)+1+strlen(message);
   notice.z_message=owl_malloc(notice.z_message_len+10);
-  strcpy(notice.z_message, zsigtmp);
-  memcpy(notice.z_message+strlen(zsigtmp)+1, message, strlen(message));
+  strcpy(notice.z_message, zsig);
+  memcpy(notice.z_message+strlen(zsig)+1, message, strlen(message));
 
   /* ret=ZSendNotice(&notice, ZAUTH); */