Merge tag 'upstream/3.3.3'

[debian/amanda] / oldrecover-src / set_commands.c

diff --git a/oldrecover-src/set_commands.c b/oldrecover-src/set_commands.c
index a0c83babd339769127d9473b0e4313eb7a79cc98..9ee0448e6b9b830b433dd271f8c44605837c4e7b 100644 (file)
--- a/oldrecover-src/set_commands.c
+++ b/oldrecover-src/set_commands.c
@@ -1,6 +1,7 @@
 /*
  * Amanda, The Advanced Maryland Automatic Network Disk Archiver
  * Copyright (c) 1991-1998, 2000 University of Maryland at College Park
+ * Copyright (c) 2007-2012 Zmanda, Inc.  All Rights Reserved.
  * All Rights Reserved.
  *
  * Permission to use, copy, modify, distribute, and sell this software and its
@@ -30,6 +31,7 @@
  */
 
 #include "amanda.h"
+#include "match.h"
 #include "util.h"
 #include "amrecover.h"
 
@@ -309,7 +311,7 @@ cd_glob(
     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);
     }
@@ -347,7 +349,7 @@ cd_regex(
     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);
     }
@@ -391,7 +393,7 @@ cd_dir(
                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);