Minor changes.

[egate.git] / kernel / eti.c

diff --git a/kernel/eti.c b/kernel/eti.c
index 48178a0..de0634b 100644 (file)
--- a/kernel/eti.c
+++ b/kernel/eti.c
@@ -45,7 +45,20 @@
  * Europagate, 1995
  *
  * $Log: eti.c,v $
- * Revision 1.14  1995/05/19 13:25:59  adam
+ * Revision 1.18  1996/03/01 14:25:28  adam
+ * Email gateway obeys 'Reply-To:' in header.
+ *
+ * Revision 1.17  1995/12/20  16:27:24  adam
+ * Extra parameter block to gw_db_open.
+ *
+ * Revision 1.16  1995/07/11  11:49:11  adam
+ * LINE_MAX renamed to STR_LINE_MAX.
+ *
+ * Revision 1.15  1995/07/03  12:59:28  adam
+ * New option for eti: -c dir to chdir before start.
+ * Setting change: gw.max.show defaults to 100.
+ *
+ * Revision 1.14  1995/05/19  13:25:59  adam
  * Bug fixes. Better command line options.
  *
  * Revision 1.13  1995/05/16  09:40:41  adam
@@ -111,7 +124,7 @@
 #include <gip.h>
 #include <strqueue.h>
 
-#define LINE_MAX 1024
+#define STR_LINE_MAX 1024
 
 static char *module = "eti";
 static jmp_buf retry_jmp;
@@ -135,6 +148,8 @@ static int email_header (struct str_queue *sq,
             return 0;
         if (memcmp (msg, "From ", 5) == 0)
             sscanf (msg+4, "%s", from_str);
+        if (memcmp (msg, "Reply-To: ", 10) == 0)
+            sscanf (msg+10, "%s", from_str);
         if (memcmp (msg, "Subject: ", 9) == 0 &&
             sscanf (msg+9, "%s", subject_str+1) == 1)
             strcpy (subject_str, msg+9);
@@ -189,9 +204,9 @@ static void deliver (struct str_queue *sq, GIP gip, const char *msg)
 
 int main (int argc, char **argv)
 {
-    char from_str[LINE_MAX+1];
-    char subject_str[LINE_MAX+1];
-    char line_str[LINE_MAX+1];
+    char from_str[STR_LINE_MAX+1];
+    char subject_str[STR_LINE_MAX+1];
+    char line_str[STR_LINE_MAX+1];
     char msg[20];
     GW_DB user_db;
     GIP  gip;
@@ -225,6 +240,7 @@ int main (int argc, char **argv)
                 fprintf (stderr, " -l log  Set Log file\n");
                 fprintf (stderr, " -d      Enable debugging log\n");
                 fprintf (stderr, " -D      Enable more debugging log\n");
+                fprintf (stderr, " -c dir  Change to directory\n");
                 fprintf (stderr, " --      Precedes kernel options "
                          "(kernel is invoked instead of monitor)\n");
                 exit (1);
@@ -245,6 +261,23 @@ int main (int argc, char **argv)
             case 'D':
                 gw_log_level (GW_LOG_ALL);
                 break;
+            case 'c':
+                if (argv[argno][2])
+                {
+                    if (chdir (argv[argno]+2)) 
+                        gw_log (GW_LOG_WARN|GW_LOG_ERRNO, module, "chdir");
+                } 
+                else if (++argno < argc)
+                {
+                    if (chdir (argv[argno])) 
+                        gw_log (GW_LOG_WARN|GW_LOG_ERRNO, module, "chdir");
+                }
+                else
+                {
+                    fprintf (stderr, "%s: missing chdir name\n", *argv);
+                    exit (1);
+                }
+                break;
             default:
                 fprintf (stderr, "%s: unknown option `%s'; use -H for help\n",
                          *argv, argv[argno]);
@@ -257,7 +290,7 @@ int main (int argc, char **argv)
         gw_log (GW_LOG_FATAL|GW_LOG_ERRNO, module, "str_queue_mk");
         exit (1);
     }
-    while (fgets (line_str, LINE_MAX, stdin))
+    while (fgets (line_str, STR_LINE_MAX, stdin))
         str_queue_enq (queue, line_str);
 
     r = email_header (queue, from_str, subject_str);
@@ -267,7 +300,7 @@ int main (int argc, char **argv)
         exit (1);
     }
     gw_log (GW_LOG_STAT, module, "Mail from %s", from_str);
-    user_db = gw_db_open ("user.db", 1);
+    user_db = gw_db_open ("user.db", 1, 1);
 
     r = gw_db_lookup (user_db, from_str, strlen(from_str),
                       &user_info, &info_length);