Changeset de3f641 for zwrite.c

Timestamp:

Sep 28, 2009, 3:19:50 PM (15 years ago)

Author:

Karl Ramm <kcr@1ts.org>

Branches:

master, release-1.10, release-1.4, release-1.5, release-1.6, release-1.7, release-1.8, release-1.9

Children:

39cff48

Parents:

bb79a52

git-author:

Karl Ramm <kcr@1ts.org> (09/26/09 12:25:28)

git-committer:

Karl Ramm <kcr@1ts.org> (09/28/09 15:19:50)

Message:

Perl callout for zsig computation + move default to perl

Barnowl::default_zephyr_signature works out what your zsig
should be.

New owl variable zsigfunc, which contains a perl expression
that is evaluated for the zsig.  Defaults to the above.

This is much more pleasant code in perl than in C.

File:

• zwrite.c (modified) (1 diff)

zwrite.c

@@ -154 +154 @@
 void owl_zwrite_populate_zsig(owl_zwrite *z)
 {
-  const char *zsigproc, *zsigowlvar, *zsigzvar;
-  char *ptr;
-  struct passwd *pw;
-
   /* get a zsig, if not given */
-  if (z->zsig==NULL) {
-    zsigproc = owl_global_get_zsigproc(&g);
-    zsigowlvar = owl_global_get_zsig(&g);
-    zsigzvar = owl_zephyr_get_variable("zwrite-signature");
-
-    if (zsigowlvar && *zsigowlvar) {
-      z->zsig=owl_validate_utf8(zsigowlvar);
-    } else if (zsigproc && *zsigproc) {
-      FILE *file;
-      char buff[LINE], *openline;
-      
-      /* simple hack for now to nuke stderr */
-#if OWL_STDERR_REDIR
-      openline = owl_strdup(zsigproc);
-#else
-      openline = owl_sprintf("%s 2> /dev/null", zsigproc);
-#endif
-      file=popen(openline, "r");
-      owl_free(openline);
-      if (!file) {
-        if (zsigzvar && *zsigzvar) {
-          z->zsig=owl_validate_utf8(zsigzvar);
-        }
-      } else {
-        z->zsig=owl_malloc(LINE*5);
-        strcpy(z->zsig, "");
-        while (fgets(buff, LINE, file)) { /* wrong sizing */
-          strcat(z->zsig, buff);
-        }
-        pclose(file);
-        if (z->zsig[0] != '\0' && z->zsig[strlen(z->zsig) - 1] == '\n') {
-          z->zsig[strlen(z->zsig)-1]='\0';
-        }
-      }
-    } else if (zsigzvar) {
-      z->zsig=owl_validate_utf8(zsigzvar);
-    } else if (((pw=getpwuid(getuid()))!=NULL) && (pw->pw_gecos)) {
-      z->zsig=owl_validate_utf8(pw->pw_gecos);
-      ptr=strchr(z->zsig, ',');
-      if (ptr) {
-        ptr[0]='\0';
-      }
-    }
-  }
+  if (z->zsig != NULL)
+    return;
+
+  z->zsig = owl_perlconfig_execute(owl_global_get_zsigfunc(&g));
 }