Changeset 1241 in MondoRescue
- Timestamp:
- Mar 12, 2007, 2:22:55 AM (18 years ago)
- Location:
- branches/stable/mondo/src
- Files:
-
- 8 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/stable/mondo/src/common/libmondo-filelist.c
r1224 r1241 451 451 mr_msg(8, "Analyzing %s", file_to_analyze); 452 452 /* BERLIOS : to be checked */ 453 mr_asprintf(&strtmp, syscall_sprintf, mr_stresc(file_to_analyze, "`$\\\"", '\\'));453 mr_asprintf(&strtmp, syscall_sprintf, mr_stresc(file_to_analyze, "`$\\\"", BACKSLASH)); 454 454 mr_asprintf(&sys_call, "%s 2>> /dev/null", strtmp); 455 455 mr_free(strtmp); … … 1709 1709 { 1710 1710 int retval = 0; 1711 struct s_node *found_node ;1712 FILE *fin ;1713 FILE *fout ;1711 struct s_node *found_node = NULL; 1712 FILE *fin = NULL; 1713 FILE *fout = NULL; 1714 1714 char *fname = NULL; 1715 char *tmp ;1715 char *tmp = NULL; 1716 1716 size_t len = 0; // Scrub's patch doesn't work without that 1717 1717 … … 1750 1750 } 1751 1751 mr_msg(5, "Found '%s'", fname); 1752 t urn_wildcard_chars_into_literal_chars(tmp, fname);1752 tmp = mr_stresc(fname, WILDCHARS, BACKSLASH); 1753 1753 fprintf(fout, "%s\n", tmp); 1754 1754 mr_free(tmp); -
branches/stable/mondo/src/common/libmondo-string-EXT.h
r1178 r1241 39 39 40 40 extern char *media_descriptor_string(t_bkptype); 41 42 extern inline void turn_wildcard_chars_into_literal_chars(char *out,43 char *in); -
branches/stable/mondo/src/common/libmondo-string.c
r1195 r1241 103 103 } 104 104 in_out[i] = '\0'; 105 }106 107 108 inline void turn_wildcard_chars_into_literal_chars(char *strout, char *strin)109 {110 char *p, *q;111 112 for (p = strin, q = strout; *p != '\0'; *(q++) = *(p++)) {113 if (strchr("[]*?", *p)) {114 *(q++) = '\\';115 }116 }117 *q = *p; // for the final '\0'118 105 } 119 106 -
branches/stable/mondo/src/common/libmondo-string.h
r1168 r1241 32 32 char *percent_media_full_comment(struct s_bkpinfo *bkpinfo); 33 33 char *media_descriptor_string(t_bkptype); 34 inline void turn_wildcard_chars_into_literal_chars(char *out, char *in); -
branches/stable/mondo/src/include/mr_str.h
r1182 r1241 9 9 #define MR_STR_H 10 10 11 /* Constants for mr_stresc */ 12 #define WILDCHARS "[]*?" 13 #define BACKSLASH '\\' 14 11 15 /* functions (public methods) */ 12 16 -
branches/stable/mondo/src/lib/mr_str.c
r1217 r1241 56 56 * @note this function allocates memory that needs to be freed by caller 57 57 **/ 58 char *mr_stresc(char *instr, char *toesc, const char escchr) 59 { 60 58 char *mr_stresc(char *instr, char *toesc, const char escchr) { 61 59 char *inptr = NULL; 62 60 char *retstr = NULL; -
branches/stable/mondo/src/mondoarchive/mondoarchive.c
r1228 r1241 236 236 g_text_mode = TRUE; 237 237 setup_newt_stuff(); 238 malloc_string(tmp); 239 turn_wildcard_chars_into_literal_chars(tmp, argv[2]); 238 tmp = mr_stresc(argv[2], WILDCHARS, BACKSLASH); 240 239 printf("in=%s; out=%s\n", argv[2], tmp); 241 240 mr_free(tmp); -
branches/stable/mondo/src/mondorestore/mondo-rstr-tools.c
r1219 r1241 1106 1106 if (IS_THIS_A_STREAMING_BACKUP(bkpinfo->backup_media_type)) { 1107 1107 mr_asprintf(&command, 1108 "tar -zxf %s %s %s %s %s %s", 1108 "tar -b %ld -zxf %s %s %s %s %s %s", 1109 bkpinfo->internal_tape_block_size, 1109 1110 bkpinfo->media_device, 1110 1111 MOUNTLIST_FNAME_STUB, … … 1192 1193 log_to_screen(_("Pre-processing filelist")); 1193 1194 if (!does_file_exist(g_biggielist_txt)) { 1194 mr_asprintf(&command, " > %s", g_biggielist_txt);1195 mr_asprintf(&command, "echo -n > %s", g_biggielist_txt); 1195 1196 paranoid_system(command); 1196 1197 mr_free(command);
Note:
See TracChangeset
for help on using the changeset viewer.