From c06ad207506b26cd6289d4a9068a43a5b5bb77db Mon Sep 17 00:00:00 2001
From: Adam Dickmeiss <adam@indexdata.dk>
Date: Tue, 21 Feb 1995 13:59:54 +0000
Subject: [PATCH] Minor changes.

---
 Makefile         |   39 +++------------------------------------
 fml/fml.c        |    6 ++++--
 kernel/Makefile  |    7 +++++--
 res+log/gw-res.c |    9 ++++++---
 4 files changed, 18 insertions(+), 43 deletions(-)

diff --git a/Makefile b/Makefile
index 5d6e24d..863ede7 100644
--- a/Makefile
+++ b/Makefile
@@ -1,41 +1,7 @@
 # Top level Makefile for Email gateway.
 # Europagate, 1994-1995.
 #
-# $Log: Makefile,v $
-# Revision 1.11  1995/02/21 12:10:56  adam
-# ZDist prefix inherited. CPP command inherited. New make entry
-# 'cleandepend' which effectively remove any dependencies specification
-# in sub-Makefiles.
-#
-# Revision 1.10  1995/02/16  18:36:18  quinn
-# Changed order yet again
-#
-# Revision 1.9  1995/02/16  18:35:43  quinn
-# Changing order.
-#
-# Revision 1.8  1995/02/16  18:34:06  adam
-# Minor changes.
-#
-# Revision 1.7  1995/02/16  15:01:26  quinn
-# Added zlayer
-#
-# Revision 1.6  1995/02/16  14:47:31  quinn
-# Removed CC
-#
-# Revision 1.5  1995/02/15  17:40:47  adam
-# New module kernel.
-#
-# Revision 1.4  1995/02/13  12:34:56  adam
-# New module ccl.
-#
-# Revision 1.3  1995/02/10  17:21:17  adam
-# FML is add as sub Makefile.
-#
-# Revision 1.2  1995/02/10  16:48:52  adam
-# Minor changes.
-#
-# Revision 1.1.1.1  1995/02/09  17:27:11  adam
-# Initial version of email gateway under CVS control.
+# $Id: Makefile,v 1.12 1995/02/21 13:59:54 adam Exp $
 #
 SHELL=/bin/sh
 MAKE=make
@@ -44,9 +10,10 @@ CFLAGS=-Wall -g -pedantic -ansi
 #CC=gcc
 CPP=$(CC) -E
 ZPRE=/home/proj/zdist/zdist102b1-1/libz3950
+#NETLIB=-lnsl -lsocket
 
 all:
-	for i in $(SUBDIR); do cd $$i; if $(MAKE) CFLAGS="$(CFLAGS)" CC="$(CC)" ZPRE="$(ZPRE)" CPP="$(CPP)"; then cd ..; else exit 1; fi; done
+	for i in $(SUBDIR); do cd $$i; if $(MAKE) CFLAGS="$(CFLAGS)" CC="$(CC)" ZPRE="$(ZPRE)" CPP="$(CPP)" NETLIB="$(NETLIB)"; then cd ..; else exit 1; fi; done
 
 dep depend:
 	for i in $(SUBDIR); do cd $$i; if $(MAKE) depend; then cd ..; else exit 1; fi; done
diff --git a/fml/fml.c b/fml/fml.c
index 371d2b4..74caaee 100644
--- a/fml/fml.c
+++ b/fml/fml.c
@@ -2,7 +2,10 @@
  * FML interpreter. Europagate, 1995
  *
  * $Log: fml.c,v $
- * Revision 1.8  1995/02/10 18:15:52  adam
+ * Revision 1.9  1995/02/21 14:00:03  adam
+ * Minor changes.
+ *
+ * Revision 1.8  1995/02/10  18:15:52  adam
  * FML function 'strcmp' implemented. This function can be used to
  * test for existence of MARC fields.
  *
@@ -532,7 +535,6 @@ static struct fml_node *fml_sub0 (Fml fml, struct fml_node *list)
     if (!list)
         return NULL;
     fml_init_token (&token, fml);
-    assert (list);
     fml_cmd_lex (&list, &token);
     fn1 = fn = fml_sub1 (fml, &list, &token);
     if (fn->p[1] && token.kind != '\0')
diff --git a/kernel/Makefile b/kernel/Makefile
index a7a02b8..231c015 100644
--- a/kernel/Makefile
+++ b/kernel/Makefile
@@ -2,7 +2,10 @@
 # Europagate, 1995
 #
 # $Log: Makefile,v $
-# Revision 1.5  1995/02/21 12:11:59  adam
+# Revision 1.6  1995/02/21 14:00:08  adam
+# Minor changes.
+#
+# Revision 1.5  1995/02/21  12:11:59  adam
 # Diagnostic record with error info. observed.
 #
 # Revision 1.4  1995/02/20  21:16:16  adam
@@ -39,7 +42,7 @@ DEFS=$(INCLUDE) -DUSE_FML=1
 all: $(TPROG1)
 
 $(TPROG1): $(O) $(USELIBS1)
-	$(CC) $(CFLAGS) -o $(TPROG1) $(O) $(USELIBS1)
+	$(CC) $(CFLAGS) -o $(TPROG1) $(O) $(USELIBS1) $(NETLIB)
 
 .c.o:
 	$(CC) -c $(DEFS) $(CFLAGS) $<
diff --git a/res+log/gw-res.c b/res+log/gw-res.c
index d3ce2ec..5bb95ae 100644
--- a/res+log/gw-res.c
+++ b/res+log/gw-res.c
@@ -4,9 +4,12 @@
    Europagate, 1994-1995.
 
    $Log: gw-res.c,v $
-   Revision 1.2  1995/02/16 13:21:30  adam
-   A few logging messages added.
+   Revision 1.3  1995/02/21 14:00:11  adam
+   Minor changes.
 
+ * Revision 1.2  1995/02/16  13:21:30  adam
+ * A few logging messages added.
+ *
  * Revision 1.1.1.1  1995/02/09  17:27:12  adam
  * Initial version of email gateway under CVS control.
  *
@@ -481,7 +484,7 @@ int gw_res_commit (GwRes id, const char *fname)
             while (1)
             {
                 int left = 78-pos;
-                if (strlen(rl->value+i) <= left)
+                if ((int) strlen(rl->value+i) <= left)
                     break;
                 while (left > 0)
                 {
-- 
1.7.10.4