[Midnightbsd-cvs] src: libexec/mport.create: Moved parselist to libmport.

[ctriv at midnightbsd.org]

Log Message:
-----------
Moved parselist to libmport.

Modified Files:
--------------
    src/libexec/mport.create:
        Makefile (r1.1 -> r1.2)
        mport.create.c (r1.1 -> r1.2)

-------------- next part --------------
Index: mport.create.c
===================================================================
RCS file: /home/cvs/src/libexec/mport.create/mport.create.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -Llibexec/mport.create/mport.create.c -Llibexec/mport.create/mport.create.c -u -r1.1 -r1.2
--- libexec/mport.create/mport.create.c
+++ libexec/mport.create/mport.create.c
@@ -42,7 +42,6 @@
 
 #define STRING_EQ(s1, s2) (strcmp((s1), (s2)) == 0)
 
-static void parselist(char *, char ***);
 static void usage(void);
 
 int main(int argc, char *argv[]) 
@@ -89,7 +88,7 @@
         pack->prefix = optarg;
         break;
       case 'D':
-        parselist(optarg, &(pack->depends));
+        mport_parselist(optarg, &(pack->depends));
         break;
       case 'M':
         pack->mtree = optarg;
@@ -98,7 +97,7 @@
         pack->origin = optarg;
         break;
       case 'C':
-        parselist(optarg, &(pack->conflicts));
+        mport_parselist(optarg, &(pack->conflicts));
         break;
       case 'i':
         pack->pkginstall = optarg;
@@ -128,47 +127,8 @@
   
   return 0;
 }
-
-static void parselist(char *opt, char ***list) 
-{
-  int len;
-  char *input;
-  char *field;
-
-  input = (char *)malloc(strlen(opt));
-  strlcpy(input, opt, strlen(opt));
   
-  /* first we need to get the length of the depends list */
-  for (len = 0; (field = strsep(&opt, " \t\n")) != NULL;) {
-    if (*field != '\0')
-      len++;
-  }    
-
-  if (len == 0) {
-    *list = NULL;
-    return;
-  }
-
-  fprintf(stderr, "List len: %i\n", len);
-
-  *list = (char **)malloc((len + 1) * sizeof(char *));
 
-  /* dereference once so we don't loose our minds. */
-  char **vec = *list;
-  
-  fprintf(stderr, "Parsing '%s'\n", input);
-  while ((field = strsep(&input, " \t\n")) != NULL) {
-    if (*field == '\0')
-      continue;
-
-    *vec = field;
-    fprintf(stderr, "List pos: %p\n", vec);
-    vec++;
-  }
-  
-  vec = NULL;
-}
-  
 static void usage() 
 {
   fprintf(stderr, "Coming soon: usage!\n");
Index: Makefile
===================================================================
RCS file: /home/cvs/src/libexec/mport.create/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -Llibexec/mport.create/Makefile -Llibexec/mport.create/Makefile -u -r1.1 -r1.2
--- libexec/mport.create/Makefile
+++ libexec/mport.create/Makefile
@@ -5,7 +5,7 @@
 
 NO_MAN=		yes
 
-LDADD= 	${LIBMPORT} ${LIBSQLITE3} ${LIBPTHREAD} ${LIBMD}
-DPADD= 	${LIBMPORT} ${LIBSQLITE3} ${LIBPTHREAD} ${LIBMD}
+LDADD= 	${LIBMPORT} ${LIBSQLITE3} ${LIBPTHREAD} ${LIBMD} ${LIBARCHIVE} ${LIBBZ2}
+DPADD= 	${LIBMPORT} ${LIBSQLITE3} ${LIBPTHREAD} ${LIBMD} ${LIBARCHIVE} ${LIBBZ2}
 
 .include <bsd.prog.mk>