[BACK]Return to patch-makeip.c CVS log [TXT][DIR] Up to [cvs.NetBSD.org] / pkgsrc / sysutils / dc-tools / patches
File: [cvs.NetBSD.org] / pkgsrc / sysutils / dc-tools / patches / patch-makeip.c (download)

Revision 1.2, Fri Nov 30 19:27:25 2018 UTC (4 years, 3 months ago) by maya
Branch: MAIN
CVS Tags: pkgsrc-2022Q4-base, pkgsrc-2022Q4, pkgsrc-2022Q3-base, pkgsrc-2022Q3, pkgsrc-2022Q2-base, pkgsrc-2022Q2, pkgsrc-2022Q1-base, pkgsrc-2022Q1, pkgsrc-2021Q4-base, pkgsrc-2021Q4, pkgsrc-2021Q3-base, pkgsrc-2021Q3, pkgsrc-2021Q2-base, pkgsrc-2021Q2, pkgsrc-2021Q1-base, pkgsrc-2021Q1, pkgsrc-2020Q4-base, pkgsrc-2020Q4, pkgsrc-2020Q3-base, pkgsrc-2020Q3, pkgsrc-2020Q2-base, pkgsrc-2020Q2, pkgsrc-2020Q1-base, pkgsrc-2020Q1, pkgsrc-2019Q4-base, pkgsrc-2019Q4, pkgsrc-2019Q3-base, pkgsrc-2019Q3, pkgsrc-2019Q2-base, pkgsrc-2019Q2, pkgsrc-2019Q1-base, pkgsrc-2019Q1, pkgsrc-2018Q4-base, pkgsrc-2018Q4, HEAD
Changes since 1.1: +2 -9 lines 

dc-tools: un-expand SUBST'd variable. Add RCS Ids.

$NetBSD: patch-makeip.c,v 1.2 2018/11/30 19:27:25 maya Exp $

--- makeip.c.orig	2000-09-05 11:56:58.000000000 -0700
+++ makeip.c	2018-11-30 08:24:17.000000000 -0800
@@ -74,7 +74,7 @@ int parse_input(FILE *fh, char *ip)
   while(fgets(buf, sizeof(buf), fh)) {
     char *p;
     trim(buf);
-    if(*buf)
+    if(*buf) {
       if((p = strchr(buf, ':'))) {
 	*p++ = '\0';
 	trim(buf);
@@ -89,7 +89,7 @@ int parse_input(FILE *fh, char *ip)
 	while(*p == ' ' || *p == '\t')
 	  p++;
 	if(strlen(p)>fields[i].len) {
-	  fprintf(stderr, "Data for field \"%s\" is too long.\n", fields[i]);
+	  fprintf(stderr, "Data for field \"%s\" is too long.\n", fields[i].name);
 	  return 0;
 	}
 	memcpy(ip+fields[i].pos, p, strlen(p));
@@ -101,11 +101,12 @@ int parse_input(FILE *fh, char *ip)
 	fprintf(stderr, "Missing : on line.\n");
 	return 0;
       }
+    }
   }
 
   for(i=0; i<NUM_FIELDS; i++)
     if(!filled_in[i]) {
-      fprintf(stderr, "Missing value for \"%s\".\n", fields[i]);
+      fprintf(stderr, "Missing value for \"%s\".\n", fields[i].name);
       return 0;
     }