WebSVN – SvarDOS – Diff – //pkg/trunk/pkginst.c

   sprintf(buff, "%s\\appinfo\\%s.lsm", dosdir, pkgname);
   mkpath(buff);
   /* start by extracting the APPINFO (LSM) file - I need it so I can append the
    * list of files belonging to the packages later */
+  printf(" %s -> %s\n", ziplinkedlist->filename, buff);
   unzip_result = zip_unzip(zipfd, ziplinkedlist, buff);
   if (unzip_result != 0) {
-    kitten_printf(8, 3, ziplinkedlist, buff); /* "ERROR: failed extracting '%s' to '%s'!" */
+    kitten_printf(10, 4, unzip_result); /* "ERROR: unzip failure (%d)" */
-    printf(" [%d]\n", unzip_result);
+    puts("");
     return(-1);
+  }
-  printf(" %s -> %s\n", ziplinkedlist->filename, buff);
   filesextractedsuccess++;
   /* open the (freshly created) LSM file */
   lsmfd = fopen(buff, "ab"); /* opening in APPEND mode so I do not loose the LSM content */
   if (lsmfd == NULL) {
     /* create the path, just in case it doesn't exist yet */
     mkpath(buff);
     sprintf(fulldestfilename, "%s%s", buff, shortfile);
     /* Now unzip the file */
+    printf(" %s -> %s", curzipnode->filename, buff);
     unzip_result = zip_unzip(zipfd, curzipnode, fulldestfilename);
+    puts("");
     if (unzip_result != 0) {
-      kitten_printf(8, 3, curzipnode->filename, fulldestfilename); /* "ERROR: failed extracting '%s' to '%s'!" */
+      kitten_printf(10, 4, unzip_result); /* "ERROR: unzip failure (%d)" */
-      printf(" [%d]\n", unzip_result);
+      puts("");
       filesextractedfailure += 1;
     } else {
-      printf(" %s -> %s\n", curzipnode->filename, buff);
       filesextractedsuccess += 1;
+    }
+  }
   fclose(lsmfd);

Subversion Repositories SvarDOS

(root)//pkg/trunk/pkginst.c – Rev 1880 → 1891