Changeset 86 for trunk/src/sh_gpg.c

Timestamp:

Jan 20, 2007, 11:04:59 PM (18 years ago)

Author:

rainer

Message:

More thorough fix for ticket #47, and corresponding regression test.

File:

• trunk/src/sh_gpg.c (modified) (4 diffs)

trunk/src/sh_gpg.c

@@ -115 +115 @@
 
 #ifdef GPG_HASH
+
 static int sh_gpg_checksum (SL_TICKET checkfd, int flag)
 {
@@ -202 +203 @@
 }
 #endif
+
+struct startup_info {
+  long   line;
+  char * program;
+  long   uid;
+  char * path;
+  char * key_uid;
+  char * key_id;
+};
+
+static struct startup_info startInfo = { 0, NULL, 0, NULL, NULL, NULL };
+
+void sh_gpg_log_startup ()
+{
+  if (startInfo.program != NULL)
+    {
+      sh_error_handle ((-1), FIL__, startInfo.line, 0, MSG_START_GH,
+                       startInfo.program, startInfo.uid,
+                       startInfo.path,
+                       startInfo.key_uid, startInfo.key_id);
+    }
+  return;
+}
+
+static void sh_gpg_fill_startup (long line, char * program, long uid, char * path, 
+                                 char * key_uid, char * key_id)
+{
+  startInfo.line    = line;
+  startInfo.program = sh_util_strdup(program);
+  startInfo.uid     = uid;
+  startInfo.path    = sh_util_strdup(path);
+  startInfo.key_uid = sh_util_strdup(key_uid);
+  startInfo.key_id  = sh_util_strdup(key_id);
+  return;
+}
 
 static FILE * sh_gpg_popen (sh_gpg_popen_t  *source, int fd, 
@@ -968 +1004 @@
             {
               tmp  = sh_util_safe_name(gp.conf_id);
-              sh_error_handle ((-1), FIL__, __LINE__, 0, MSG_START_GH,
+              sh_gpg_fill_startup (
+                                   /* sh_error_handle ((-1), FIL__, __LINE__, 0, MSG_START_GH, */
                                sh.prg_name, sh.real.uid,
                                (sh.flag.hidefile == S_TRUE) ? 
@@ -995 +1032 @@
         {
           tmp = sh_util_safe_name(gp.conf_id);
-          sh_error_handle ((-1), FIL__, __LINE__, 0, MSG_START_GH,
+          sh_gpg_fill_startup (__LINE__,
+          /* sh_error_handle ((-1), FIL__, __LINE__, 0, MSG_START_GH, */
                            sh.prg_name, sh.real.uid,
                            (sh.flag.hidefile == S_TRUE) ?