Changeset 30

Timestamp:

May 7, 2010, 6:49:10 PM (15 years ago)

Author:

herwigb

Message:

Split parameter string into separate parameters

Location:

branches/1.0/src

Files:

• build.cmd (modified) (2 diffs)
• de/uni.dlg (modified) (3 diffs)
• splpd.c (modified) (6 diffs)
• utils.c (modified) (1 diff)
• utils.h (modified) (1 diff)

branches/1.0/src/build.cmd

@@ -3 +3 @@
 @del uni.o
 @del uni.pdr
+@del .\en\uni.res
 @del .\de\uni.res
 echo Done.
 echo Compiling.
-gcc -o utils.o utils.c -c>build.log
-gcc -o splpd.o splpd.c -c>>build.log
-gcc -o uni.o uni.c -c>>build.log
+gcc -o utils.o utils.c -c >build.log
+gcc -o splpd.o splpd.c -c >>build.log
+gcc -o uni.o uni.c -c     >>build.log
 echo Done.
 echo Compiling resources.
 cd de
-RC -r uni.RC uni.RES >>build.log
+RC -r uni.rc uni.res      >>..\build.log
 cd ..
 echo Done.
@@ -21 +22 @@
 ea2 -e DEFAULT_PORT=UNI uni.pdr >>build.log
 echo Done.
-rem d:
-rem cd \OS2\DLL
-rem lxunlock uni.pdr
+d:
+cd \OS2\DLL
+lxunlock uni.pdr

branches/1.0/src/de/uni.dlg

@@ -13 +13 @@
         DEFPUSHBUTTON   "OK", DID_OK, 5, 5, 76, 14
                         PRESPARAMS PP_FONTNAMESIZE, "9.WarpSans Bold"
-        PUSHBUTTON      "Cancel ", DID_CANCEL, 149, 5, 76, 14
+        PUSHBUTTON      "Cancel", DID_CANCEL, 149, 5, 76, 14
                         PRESPARAMS PP_FONTNAMESIZE, "9.WarpSans Bold"
         GROUPBOX        "Universal port driver properties", GB_UNICFG, 5, 24, 
@@ -19 +19 @@
                         PRESPARAMS PP_FOREGROUNDCOLOR, 0x00000000L
                         PRESPARAMS PP_FONTNAMESIZE, "9.WarpSans Bold"
-        LTEXT           "Program:", DT_PROGRAM, 13, 118, 53, 8, DT_VCENTER
+        LTEXT           "Path amd file:", DT_PROGRAM, 13, 118, 53, 8, DT_VCENTER
         ENTRYFIELD      "", ID_PROGRAM, 15, 106, 200, 8, ES_MARGIN
         LTEXT           "Parameters:", DT_PARAMETERS, 13, 71, 204, 8, 
@@ -26 +26 @@
         LTEXT           "Working directory:", DT_DIRECTORY, 13, 45, 203, 8
         ENTRYFIELD      "", ID_DIRECTORY, 15, 33, 200, 8, ES_MARGIN
-        PUSHBUTTON      "Find", DID_FIND, 13, 86, 62, 14
+        PUSHBUTTON      "~Find...", DID_FIND, 13, 86, 62, 14
         PUSHBUTTON      "Setup Wizard", DID_SETUPWIZARD, 155, 86, 62, 14
     END

branches/1.0/src/splpd.c

@@ -489 +489 @@
         char        arg[256];
         char        *j_parms;
+        int         allocSize = 0;
         char        j_id[3];
         char        parameters[256];
@@ -506 +507 @@
         char        spool_dir[256];
         ULONG       ulBootDrive;
+        char        *p1 = NULL;
+        char        *p2 = NULL;
+        char        *p3 = NULL;
+        char        *p4 = NULL;
+        char        *p5 = NULL;
+        char        *p6 = NULL;
+        char        *p7 = NULL;
+        char        *p8 = NULL;
+        char        *p9 = NULL;
 
         rc = PrfQueryProfileString (HINI_SYSTEMPROFILE,
@@ -568 +578 @@
 //      decryptPassword(password_enc,password_dec);
 
-        j_parms = malloc((strlen(parameters) - strlen("%file%") + strlen(filename)) * sizeof(char));
-
-        searchReplace("%file%", filename, parameters, j_parms);
+//  allocate needed space for the returning string +1 (for string terminator)
+        allocSize = strlen(parameters) - strlen("%file%") + strlen(filename);
+
+        j_parms = malloc((allocSize +1) * sizeof(char));
+
+//  searchReplace(search, replace, string, replaced, allocSize);
+        searchReplace("%file%", filename, parameters, j_parms, allocSize);
+
+//  split into single paramters 
+        p1 = strtok (j_parms, " ");
+        p2 = strtok (NULL, " ");
+        p3 = strtok (NULL, " ");
+        p4 = strtok (NULL, " ");
+        p5 = strtok (NULL, " ");
+        p6 = strtok (NULL, " ");
+        p7 = strtok (NULL, " ");
+        p8 = strtok (NULL, " ");
+        p9 = strtok (NULL, " ");
 
         if (strlen(workingdir) > 0)
@@ -576 +601 @@
                 chdir(workingdir);      
         };
-        rc = spawnlp(P_WAIT,binfile,binfile,j_parms,NULL);
+
+        rc = spawnlp(P_WAIT,binfile,binfile,p1,p2,p3,p4,p5,p6,p7,p8,p9,NULL);
 
         while (rc != 0)
         {
-                sprintf(errorstr,"Error during spooling to %s %s",binfile,j_parms);
+                sprintf(errorstr,"Error during spooling to %s %s %s %s %s %s %s %s %s %s ",binfile,p1,p2,p3,p4,p5,p6,p7,p8,p9,NULL);
+
                 resp = WinMessageBox (HWND_DESKTOP,
                                                         HWND_DESKTOP,
@@ -588 +615 @@
                 if (resp != MBID_CANCEL )
                 {
-                        rc = spawnlp(P_WAIT,binfile,binfile,j_parms,NULL);
+                        rc = spawnlp(P_WAIT,binfile,binfile,p1,p2,p3,p4,p5,p6,p7,p8,p9,NULL);
                 }
                 else rc = 0;
@@ -594 +621 @@
 
         free(j_parms);
+        
         strcpy(filename,&szTemp[pos]);
         DosDelete(filename);

branches/1.0/src/utils.c

@@ -8 +8 @@
 
 /*  replace one string by another */
-BOOL searchReplace(const char *search, const char *replace, const char *string, char *replaced)
-{
-        /* create init some variables */
-        char *searchStart;
-        int len = 0;
-
-        /* do we find the searched string at all */
-        searchStart = strstr(string, search);
-        if (searchStart == NULL)
-        {
-                strncpy(replaced, string, strlen(replaced));
-                return FALSE;
-        }
-
-        /* copy first part */
-        len = searchStart - string;
-        strncpy(replaced, string, len);
-
-        /* add the replaced string */
-        strcat(replaced, replace);
-
-        /* add the last part */
-        len += strlen(search);
-        strcat(replaced, string+len);
-
-        return TRUE;
+BOOL searchReplace(const char *search, const char *replace, const char *string, char *replaced, int size)
+{
+// create/init some variables
+        char *searchStart;
+        char *p;
+        int len = 0;
+
+// some sanity check
+        if (replaced == NULL || replace == NULL)
+        {
+                return FALSE;
+        }
+
+// do we find the searched string at all
+        searchStart = strstr(string, search);
+        if (searchStart == NULL)
+        {
+                strncpy(replaced, string, size);
+                p = replaced+size;
+                *p = '\0';
+                return FALSE;
+        }
+
+// copy first part
+        len = searchStart - string;
+        strncpy(replaced, string, len);
+        p = replaced+len;
+        *p = '\0';
+
+// add the replaced string
+        strcat(replaced, replace);
+
+// add the last part
+        len += strlen(search);
+        strcat(replaced, string+len);
+
+        return TRUE;
+}
+
+/* convert a string to uppercase */
+void uppercase( char *sPtr )
+{
+        while( *sPtr != '\0' ) {
+                *sPtr = toupper( ( unsigned char ) *sPtr );
+        }
 }
 

branches/1.0/src/utils.h

@@ -22 +22 @@
 #define __UTILS_H__
 
-BOOL searchReplace(const char *search, const char *replace, const char *org_string, char *replaced_string);
+BOOL searchReplace(const char *search, const char *replace, const char *string, char *replaced, int size);
 void decryptPassword(const char *pszCrypt, char *pszPlain);
 void encryptPassword(const char *pszPlain, char *pszCrypt);