[Midnightbsd-cvs] src: index.c: Build depends can be larger that our buffer for some of

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Sat Aug 30 12:36:06 EDT 2008


Log Message:
-----------
Build depends can be larger that our buffer for some of the larger situations.  Allow us to ignore things we don't need to know about.

Tags:
----
RELENG_0_2

Modified Files:
--------------
    src/usr.sbin/sysinstall:
        index.c (r1.3.2.2 -> r1.3.2.3)

-------------- next part --------------
Index: index.c
===================================================================
RCS file: /home/cvs/src/usr.sbin/sysinstall/index.c,v
retrieving revision 1.3.2.2
retrieving revision 1.3.2.3
diff -L usr.sbin/sysinstall/index.c -L usr.sbin/sysinstall/index.c -u -r1.3.2.2 -r1.3.2.3
--- usr.sbin/sysinstall/index.c
+++ usr.sbin/sysinstall/index.c
@@ -280,6 +280,18 @@
 }
 
 static int
+skip_to_sep(char *from, int sep)
+{
+    char *tok;
+
+    tok = strchr(from, sep);
+    if (!tok)
+	return 0;
+    *tok = '\0';
+    return tok + 1 - from;
+}
+
+static int
 readline(FILE *fp, char *buf, int max)
 {
     int rv, i = 0;
@@ -317,21 +329,21 @@
     cp += copy_to_sep(descr, cp, '|');		/* path to pkg-descr */
     cp += copy_to_sep(maint, cp, '|');		/* maintainer */
     cp += copy_to_sep(cats, cp, '|');		/* categories */
-    cp += copy_to_sep(junk, cp, '|');		/* build deps - not used */
+    cp += skip_to_sep(cp, '|');			/* build deps - not used */
     cp += copy_to_sep(rdeps, cp, '|');		/* run deps */
     if (index(cp, '|'))
-        cp += copy_to_sep(junk, cp, '|');	/* url - not used */
+        cp += skip_to_sep(cp, '|');		/* url - not used */
     else {
 	strncpy(junk, cp, 1023);
 	*volume = 0;
 	return 0;
     }
     if (index(cp, '|'))
-	cp += copy_to_sep(junk, cp, '|');	/* extract deps - not used */
+	cp += skip_to_sep(cp, '|');		/* extract deps - not used */
     if (index(cp, '|'))
-	cp += copy_to_sep(junk, cp, '|');	/* patch deps - not used */
+	cp += skip_to_sep(cp, '|');		/* patch deps - not used */
     if (index(cp, '|'))
-	cp += copy_to_sep(junk, cp, '|');	/* fetch deps - not used */
+	cp += skip_to_sep(cp, '|');		/* fetch deps - not used */
     if (index(cp, '|'))
         cp += copy_to_sep(volstr, cp, '|');	/* media volume */
     else {


More information about the Midnightbsd-cvs mailing list