Changeset 18

Timestamp:

Apr 16, 2010, 5:51:24 PM (15 years ago)

Author:

herwigb

Message:

Some more changes

File:

• branches/1.0/src/uni.c (modified) (2 diffs)

branches/1.0/src/uni.c

@@ -61 +61 @@
 
 /*  replace one string by another */
-char * stringReplace(char *search, char *replace, char *string) {
-        char *tempString, *searchStart;
-        int len=0;
-        // preuefe ob Such-String vorhanden ist
-        searchStart = strstr(string, search);
-        if(searchStart == NULL) {
-                return string;
-        }
-        // Speicher reservieren
-        tempString = (char*) malloc((strlen(string) + strlen(replace) - strlen(search))* sizeof(char));
-        // temporaere Kopie anlegen
-        strcpy(tempString, string);
-        // ersten Abschnitt in String setzen
-        len = searchStart - string;
-        strncpy(string, tempString, len);
-        // zweiten Abschnitt anhaengen
-        strcat(string, replace);
-        // dritten Abschnitt anhaengen
-        len += strlen(search);
-        strcat(string,  (char *)tempString+len);
-        return string;
-}
-
+char * searchReplace(char *search, char *replace, char *string)
+{
+// creat init some variables
+        char * tempString, *searchStart;
+        int len = 0;
+
+// do we find the searched string at all
+        searchStart = strstr(string, search);
+        if (searchStart == NULL)
+        {
+                return string;
+        }
+
+// allocate needed space for the tempstring
+        tempString = malloc((strlen(string) - strlen(search) + strlen(replace)) * sizeof(char));
+
+// copy first part
+        len = searchStart - string;
+        strncpy(tempString, string, len);
+
+// add the replaced string
+        strcat(tempString, replace);
+
+// add the last part
+        len += strlen(search);
+        strcat(tempString, string+len);
+
+// memory leek!!!       free(tempString);
+        return tempString;
+}
 
 /* Password encryption/decryption routines from ndpsmb.c */
@@ -1064 +1071 @@
 
         sprintf(j_parms,parameters);
-        stringReplace("%file%",filename,j_parms);
+        searchReplace("%file%",filename,j_parms);
         
         rc = spawnlp(P_WAIT,binfile,binfile,j_parms,NULL);