projects
/
debian
/
amanda
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
un-do make check since there's no useful content .. fooled by INSTALL!
[debian/amanda]
/
oldrecover-src
/
set_commands.c
diff --git
a/oldrecover-src/set_commands.c
b/oldrecover-src/set_commands.c
index a0c83babd339769127d9473b0e4313eb7a79cc98..7a52122a29746e4368a3f3075736cab8468fbc37 100644
(file)
--- a/
oldrecover-src/set_commands.c
+++ b/
oldrecover-src/set_commands.c
@@
-30,6
+30,7
@@
*/
#include "amanda.h"
*/
#include "amanda.h"
+#include "match.h"
#include "util.h"
#include "amrecover.h"
#include "util.h"
#include "amrecover.h"
@@
-309,7
+310,7
@@
cd_glob(
if (strcmp(disk_path, "/") == 0)
path_on_disk = stralloc2("/", regex_path);
else {
if (strcmp(disk_path, "/") == 0)
path_on_disk = stralloc2("/", regex_path);
else {
- char *clean_disk_path = clean_regex(disk_path);
+ char *clean_disk_path = clean_regex(disk_path
, 0
);
path_on_disk = vstralloc(clean_disk_path, "/", regex_path, NULL);
amfree(clean_disk_path);
}
path_on_disk = vstralloc(clean_disk_path, "/", regex_path, NULL);
amfree(clean_disk_path);
}
@@
-347,7
+348,7
@@
cd_regex(
if (strcmp(disk_path, "/") == 0)
path_on_disk = stralloc2("/", regex);
else {
if (strcmp(disk_path, "/") == 0)
path_on_disk = stralloc2("/", regex);
else {
- char *clean_disk_path = clean_regex(disk_path);
+ char *clean_disk_path = clean_regex(disk_path
, 0
);
path_on_disk = vstralloc(clean_disk_path, "/", regex, NULL);
amfree(clean_disk_path);
}
path_on_disk = vstralloc(clean_disk_path, "/", regex, NULL);
amfree(clean_disk_path);
}
@@
-391,7
+392,7
@@
cd_dir(
if(dir[strlen(dir)-1] == '/')
dir[strlen(dir)-1] = '\0'; /* remove last / */
/* remove everything before the last / */
if(dir[strlen(dir)-1] == '/')
dir[strlen(dir)-1] = '\0'; /* remove last / */
/* remove everything before the last / */
- dir1 =
rindex
(dir,'/');
+ dir1 =
strrchr
(dir,'/');
if (dir1) {
dir1++;
dir2 = stralloc(dir1);
if (dir1) {
dir1++;
dir2 = stralloc(dir1);