properly chomp lines

diff --git a/ChangeLog b/ChangeLog
index 7d2ee259a253fc169ad3c4106c4b564f511ff38a..e5c781957c5faa03622d1b72d99a8865df0e5a9d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Thu Nov 23 19:13:21 CET 2000 Wichert Akkerman <wakkerma@debian.org>
+
+  * lib/myopt.c: properly chomp read lines
+
 Thu Nov 23 17:52:44 CET 2000 Wichert Akkerman <wakkerma@debian.org>
 
   * lib/fields.c, lib/dump.c: fix two memory leaks

diff --git a/lib/myopt.c b/lib/myopt.c
index bbfe02462bbd1fd594eee57be39fb0c6472d6f81..90e6628452e45e61424c385b2a7d5715feee0bbd 100644 (file)
--- a/lib/myopt.c
+++ b/lib/myopt.c
@@ -41,9 +41,11 @@ void myfileopt(const char* fn, const struct cmdinfo* cmdinfos) {
   while (fgets(linebuf, sizeof(linebuf), file)) {
     char* opt;
     const struct cmdinfo *cip;
+    int l;
 
     if ((linebuf[0]=='#') || (linebuf[0]=='\n') || (linebuf[0]==0)) continue;
-    linebuf[strlen(linebuf)-1]=0;
+    l=strlen(linebuf);
+    if (linebuf[l-1]=='\n') linebuf[l-1]=0;
     for (opt=linebuf;isalnum(*opt)||*opt=='-';opt++) ;
     if (*opt==0)
       opt=NULL;