Lots of changes. They aren't visible though.

[egate.git] / kernel / main.c

diff --git a/kernel/main.c b/kernel/main.c
index 5ed778e..f1f1694 100644 (file)
--- a/kernel/main.c
+++ b/kernel/main.c
@@ -45,7 +45,18 @@
  * Europagate, 1995
  *
  * $Log: main.c,v $
- * Revision 1.27  1995/05/19 13:25:59  adam
+ * Revision 1.30  1996/02/12 10:04:54  adam
+ * The gateway doesn't try to reconnect if it is already known that
+ * it will fail (connect_fail flag introduced).
+ *
+ * Revision 1.29  1995/07/28  10:51:08  adam
+ * Bug fix: account from previous session had effect when new target command
+ * was executed.
+ *
+ * Revision 1.28  1995/07/03  08:20:15  adam
+ * More help information and better diagnostics.
+ *
+ * Revision 1.27  1995/05/19  13:25:59  adam
  * Bug fixes. Better command line options.
  *
  * Revision 1.26  1995/05/18  12:03:08  adam
@@ -268,6 +279,7 @@ int main (int argc, char **argv)
     info.override_res = NULL;
     *info.target = 0;
     *info.account = 0;
+    info.account_in_session = 1;
     info.lang = NULL;
     info.bibset = NULL;
     info.zass = NULL;
@@ -277,6 +289,7 @@ int main (int argc, char **argv)
     info.database = NULL;
     info.setno = -1;
     info.userid = -1;
+    info.connect_failed = 0;
 #if USE_FML
     info.fml = NULL;
 #endif
@@ -505,8 +518,6 @@ static int fml_inf_read (void)
 
 void read_kernel_res (void)
 {
-    char path_prefix[128];
-    char fname[160];
     const char *v;
     char *cp;
     char resource_name[256];
@@ -537,23 +548,19 @@ void read_kernel_res (void)
                 info.default_res);
         return;
     }
-    strcpy (path_prefix, gw_res_get (info.kernel_res, "gw.path", "."));
-    
     /* fetch target definitions (if defined at all) */
     if (*info.target)
     {
         sprintf (resource_name, "gw.target.%s", info.target);
         v = gw_res_get (info.kernel_res, resource_name, NULL);
         if (v)
-        {
-            sprintf (fname, "%s/%s", path_prefix, v);
-            gw_res_merge (info.kernel_res, fname);
-        }
+            gw_res_merge (info.kernel_res, v);
     }
     /* fetch user definitions (if user-id is specified) */
     if (info.userid >= 0)
     {
-        sprintf (fname, "%s/user.%d.r", path_prefix, info.userid);
+        char fname[250];
+        sprintf (fname, "user.%d.r", info.userid);
         gw_res_merge (info.kernel_res, fname);
     }
     /* fetch language definitions (if specified at all) */
@@ -564,18 +571,14 @@ void read_kernel_res (void)
         v = gw_res_get (info.kernel_res, resource_name, NULL);
         if (v)
         {
-            sprintf (fname, "%s/%s", path_prefix, v);
             gw_log (GW_LOG_DEBUG, KERNEL_LOG, "Reading language resources %s",
-                    fname);
-            gw_res_merge (info.kernel_res, fname);
+                    v);
+            gw_res_merge (info.kernel_res, v);
         }
     }
     /* fetch overriding resources from file (if specified) */
     if (info.override_res)
-    {
-        sprintf (fname, "%s/%s", path_prefix, info.override_res);
-        gw_res_merge (info.kernel_res, fname);        
-    }
+        gw_res_merge (info.kernel_res, info.override_res);        
 
     /* read bibset definition for ccl */
     v = gw_res_get (info.kernel_res, "gw.bibset", NULL);
@@ -583,13 +586,12 @@ void read_kernel_res (void)
     {
         FILE *bib_inf;
 
-        sprintf (fname, "%s/%s", path_prefix, v);
-        bib_inf = fopen (fname, "r");
+        bib_inf = fopen (v, "r");
         if (!bib_inf)
-            gw_log (GW_LOG_WARN, KERNEL_LOG, "cannot open %s", fname);
+            gw_log (GW_LOG_WARN, KERNEL_LOG, "cannot open %s", v);
         else
         {
-            gw_log (GW_LOG_DEBUG, KERNEL_LOG, "reading bib file %s", fname);
+            gw_log (GW_LOG_DEBUG, KERNEL_LOG, "reading bib file %s", v);
             ccl_qual_file (info.bibset, bib_inf);
             fclose (bib_inf);
         }
@@ -621,6 +623,7 @@ void read_kernel_res (void)
                  sizeof(info.hostname)-1);
         info.port = gw_res_int (info.kernel_res, "gw.portno", 210);
         strcpy (info.account, gw_res_get (info.kernel_res, "gw.account", ""));
+       info.account_in_session = 0;
     }
     /* set info.databases (all available databases for target) */
     /* set info.database (first database for target) */
@@ -674,11 +677,9 @@ void read_kernel_res (void)
     if (!info.fml)
     {
         v = gw_res_get (info.kernel_res, "gw.fml", "default.fml");    
-        sprintf (fname, "%s/%s", path_prefix, v);
-        fml_inf = fopen (fname, "r");
+        fml_inf = fopen (v, "r");
         if (!fml_inf)
-            gw_log (GW_LOG_WARN, KERNEL_LOG,
-                    "cannot open fml script %s", fname);
+            gw_log (GW_LOG_WARN, KERNEL_LOG, "cannot open fml script %s", v);
         else
         {
             info.fml = fml_open ();