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

 #include <unistd.h>    /* read() */
 #include <sys/types.h> /* struct utimbuf */
 #include "helpers.h"   /* slash2backslash() */
 #include "fileexst.h"
-#include "kprintf.h"
 #include "libunzip.h"  /* zip_listfiles()... */
 #include "showinst.h"  /* pkg_loadflist() */
 #include "svarlang.lib\svarlang.h"
 #include "pkginst.h"   /* include self for control */
 /* checks that pkgname is NOT installed. return 0 on success, non-zero otherwise. */
 static int validate_package_not_installed(const char *pkgname, const char *dosdir) {
   if (is_package_installed(pkgname, dosdir) != 0) {
+    char msg[256];
-    kitten_printf(3, 18, pkgname); /* "Package %s is already installed! You might want to use the 'update' action." */
+    /* "Package %s is already installed! You might want to use the 'update' action." */
+    sprintf(msg, svarlang_str(3,18), pkgname);
-    outputnl("");
+    outputnl(msg);
     return(-1);
+  }
   return(0);
+}
       goto RAII_ERR;
+    }
     /* abort if file is compressed with an unsupported method */
     if ((curzipnode->compmethod != ZIP_METH_STORE) && (curzipnode->compmethod != ZIP_METH_DEFLATE)) { /* unsupported compression method */
-      kitten_printf(8, 2, curzipnode->compmethod); /* "ERROR: Package contains a file compressed with an unsupported method (%d):" */
+      /* "ERROR: Package contains a file compressed with an unsupported method:" */
-      outputnl("");
+      outputnl(svarlang_str(8,2));
       outputnl(curzipnode->filename);
       goto RAII_ERR;
+    }
     /* is it the appinfo file? detach it from the list for now */
   strcat(buff, pkgname);
   strcat(buff, ".lsm");
   unzip_result = zip_unzip(zipfd, ziplinkedlist, buff, buff15k);
   outputnl("");
   if (unzip_result != 0) {
-    kitten_printf(10, 4, unzip_result); /* "ERROR: unzip failure (%d)" */
+    sprintf(buff, svarlang_str(10,4), unzip_result); /* "ERROR: unzip failure (%d)" */
-    outputnl("");
+    outputnl(buff);
     return(-1);
+  }
   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) {
-    kitten_printf(3, 10, buff); /* "ERROR: Could not create %s!" */
+    /* "ERROR: Could not create %s!" */
+    sprintf(buff15k, svarlang_str(3,10), buff);
-    outputnl("");
+    outputnl(buff15k);
     return(-2);
+  }
   fprintf(lsmfd, "\r\n"); /* in case the LSM does not end with a clear line already */
   /* write list of files in zip into the lst, and create the directories structure */
     output(" -> ");
     output(buff);
     unzip_result = zip_unzip(zipfd, curzipnode, fulldestfilename, buff15k);
     outputnl("");
     if (unzip_result != 0) {
-      kitten_printf(10, 4, unzip_result); /* "ERROR: unzip failure (%d)" */
+      sprintf(buff, svarlang_str(10,4), unzip_result); /* "ERROR: unzip failure (%d)" */
-      outputnl("");
+      outputnl(buff);
       filesextractedfailure += 1;
     } else {
       filesextractedsuccess += 1;
+    }
+  }
   fclose(lsmfd);
+  /* "Package %s installed: %ld errors, %ld files extracted." */
-  kitten_printf(3, 19, pkgname, filesextractedfailure, filesextractedsuccess); /* "Package %s installed: %ld errors, %ld files extracted." */
+  sprintf(buff15k, svarlang_str(3, 19), pkgname, filesextractedfailure, filesextractedsuccess);
-  outputnl("");
+  outputnl(buff15k);
   /* scan the LSM file for a "warn" message to display */
   display_warn_if_exists(pkgname, dosdir, buff, sizeof(buff));
   return(filesextractedfailure);

Subversion Repositories SvarDOS

(root)//pkg/trunk/pkginst.c – Rev 1964 → 1965