Changeset 831 in MondoRescue

Timestamp:

Sep 25, 2006, 1:07:16 PM (18 years ago)

Author:

andree

Message:

Add new header mr_string.h for mr_string.c. Use mr_strtok() from
mr_string.c and delete from libmondo-string.c. Add mr_string.c and
mr_string.h to Makefile.am. (Follow-up to r828.)

Location:

branches/stable/mondo/mondo/common

Files:

• Makefile.am (modified) (1 diff)
• libmondo-filelist.c (modified) (1 diff)
• libmondo-raid.c (modified) (1 diff)
• libmondo-string-EXT.h (modified) (1 diff)
• libmondo-string.c (modified) (1 diff)
• libmondo-string.h (modified) (1 diff)
• mr_string.c (modified) (2 diffs)
• mr_string.h (added)

branches/stable/mondo/mondo/common/Makefile.am

@@ -24 +24 @@
                        libmondo-string-EXT.h libmondo-tools-EXT.h \
                        libmondo-verify-EXT.h  libmondo-stream-EXT.h \
-                       newt-specific.h
+                       newt-specific.h \
+                       mr_string.c mr_string.h

branches/stable/mondo/mondo/common/libmondo-filelist.c

@@ -117 +117 @@
 #include "libmondo-gui-EXT.h"
 #include "libmondo-tools-EXT.h"
-
+#include "mr_string.h"
 
 #include <time.h>

branches/stable/mondo/mondo/common/libmondo-raid.c

@@ -48 +48 @@
 #include "lib-common-externs.h"
 #include "libmondo-raid.h"
+#include "mr_string.h"
 
 #ifdef __FreeBSD__

branches/stable/mondo/mondo/common/libmondo-string-EXT.h

@@ -44 +44 @@
 extern inline void turn_wildcard_chars_into_literal_chars(char *out,
                                                           char *in);
-/* Valid external functions */
-extern char *mr_strtok(char *instr, const char *delims, int *lastpos);

branches/stable/mondo/mondo/common/libmondo-string.c

@@ -1156 +1156 @@
     return (type_of_backup);
 }
-
-
-/* New functions safe from a memory manageemnt point of view */
-/* Developped by Andree Leidenfrost */
-
-char *mr_strtok(char *instr, const char *delims, int *lastpos) {
-
-char *token = NULL;
-char *strptr = NULL;
-size_t pos1 = 0;
-size_t pos2 = 0;
-
-if (strlen(instr) <= *lastpos) {
-    *lastpos = 0;
-    return token;
-}
-
-strptr = instr + *lastpos;
-pos2 = strspn(strptr, delims);
-strptr += pos2;
-pos1 = strcspn(strptr, delims);
-token = malloc(sizeof(*token)*(pos1+1));
-strncpy(token, strptr, pos1);
-token[pos1] = '\0';
-*lastpos = *lastpos + pos1 + pos2 + 1;
-
-return token;
-}
-/* @} - end of stringGroup */

branches/stable/mondo/mondo/common/libmondo-string.h

@@ -34 +34 @@
 char *media_descriptor_string(t_bkptype);
 inline void turn_wildcard_chars_into_literal_chars(char *out, char *in);
-
-/* Valid external functions */
-char *mr_strtok(char *instr, const char *delims, int *lastpos);

branches/stable/mondo/mondo/common/mr_string.c

@@ -1 @@
-// New generation of string handling functions
+/*
+ * mr_string.c - New generation of string handling functions
+ */
 
-
-// Safe alternative to standard function strok()
+#include <stdio.h>
+#include <string.h>
+ 
+/**
+ * Safe alternative to standard function strok()
+ * @param instr
+ * @param delims
+ * @param lastpos
+ * @return @p
+ * @note this function allocates memory that needs to be freed by caller
+ **/
 char *mr_strtok(char *instr, const char *delims, int *lastpos)
 {
@@ -29 +40 @@
 
 
-// Returns the string fed to it 'inptr' with all characters to escape given
-// in 'toesc' prepended by escaping character 'escchr'.
-// (Prepare strings for use in system() or popen() with this function.)
+/**
+ * Returns the string fed to it 'inptr' with all characters to escape given
+ * in 'toesc' prepended by escaping character 'escchr'.
+ * (Prepare strings for use in system() or popen() with this function.)
+ * @param instr
+ * @param toesc
+ * @param escchr
+ * @note this function allocates memory that needs to be freed by caller
+ **/
 char *mr_stresc(char *instr, char *toesc, const char escchr)
 {