X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=recover-src%2Fset_commands.c;h=2f659aec791bb9938c0a4489924554612a9522c7;hb=94a044f90357edefa6f4ae9f0b1d5885b0e34aee;hp=c460d380d90d9a8433e7324b28bec5176c72354e;hpb=34197d9f46a5f4e944378cbb65fca32ee0eec7b9;p=debian%2Famanda

diff --git a/recover-src/set_commands.c b/recover-src/set_commands.c
index c460d38..2f659ae 100644
--- a/recover-src/set_commands.c
+++ b/recover-src/set_commands.c
@@ -24,7 +24,7 @@
  * file named AUTHORS, in the root directory of this distribution.
  */
 /*
- * $Id: set_commands.c,v 1.26.2.1 2006/12/22 15:10:27 martinea Exp $
+ * $Id: set_commands.c,v 1.26 2006/07/05 13:14:58 martinea Exp $
  *
  * implements the "set" commands in amrecover
  */
@@ -66,8 +66,8 @@ set_date(
 	}
 	else
 	{
-	    printf("No index records for cwd on new date\n");
-	    printf("Setting cwd to mount point\n");
+	    g_printf(_("No index records for cwd on new date\n"));
+	    g_printf(_("Setting cwd to mount point\n"));
 	    disk_path = newstralloc(disk_path, "/");	/* fake it */
 	    clear_dir_list();
 	}
@@ -82,58 +82,84 @@ set_host(
     const char *host)
 {
     char *cmd = NULL;
-    struct hostent *hp;
+    struct hostent *hp = NULL;
     char **hostp;
     int found_host = 0;
+    char *uqhost = unquote_string(host);
 
     if (is_extract_list_nonempty())
     {
-	printf("Must clear extract list before changing host\n");
+	g_printf(_("Must clear extract list before changing host\n"));
 	return;
     }
 
-    cmd = stralloc2("HOST ", host);
+    /*
+     * The idea here is to try as many permutations of the hostname
+     * as we can imagine.  The server will reject anything it doesn't
+     * recognize.
+     */
+
+    cmd = stralloc2("HOST ", uqhost);
     if (converse(cmd) == -1)
 	exit(1);
     if (server_happy())
-    {
 	found_host = 1;
-    }
-    else
-    {
-	/*
-	 * Try converting the given host to a fully qualified name
-	 * and then try each of the aliases.
-	 */
-	if ((hp = gethostbyname(host)) != NULL) {
+
+    /*
+     * Try converting the given host to a fully qualified, canonical
+     * name.
+     */
+    if (!found_host) {
+	if ((hp = gethostbyname(uqhost)) != NULL) {
 	    host = hp->h_name;
-	    printf("Trying host %s ...\n", host);
+	    g_printf(_("Trying host %s ...\n"), host);
 	    cmd = newstralloc2(cmd, "HOST ", host);
 	    if (converse(cmd) == -1)
 		exit(1);
 	    if(server_happy())
-	    {
 		found_host = 1;
-	    }
-	    else
+	}
+    }
+
+    /*
+     * Since we have them, try any CNAMEs that were traversed from uqhost
+     * to the canonical name (this assumes gethostbyname was called above)
+     */
+    if (!found_host) {
+	if (hp) {
+	    for (hostp = hp->h_aliases; (host = *hostp) != NULL; hostp++)
 	    {
-	        for (hostp = hp->h_aliases; (host = *hostp) != NULL; hostp++)
-	        {
-		    printf("Trying host %s ...\n", host);
-		    cmd = newstralloc2(cmd, "HOST ", host);
-		    if (converse(cmd) == -1)
-		        exit(1);
-		    if(server_happy())
-		    {
-		        found_host = 1;
-		        break;
-		    }
+		g_printf(_("Trying host %s ...\n"), host);
+		cmd = newstralloc2(cmd, "HOST ", host);
+		if (converse(cmd) == -1)
+		    exit(1);
+		if(server_happy())
+		{
+		    found_host = 1;
+		    break;
 		}
 	    }
 	}
     }
-    if(found_host)
-    {
+
+    /* Try looking up the canonical name of the host */
+    if (!found_host) {
+	char *canonname;
+	int result;
+
+	result = resolve_hostname(uqhost, 0, NULL, &canonname);
+	if (result == 0 && canonname) {
+	    host = canonname;
+	    g_printf(_("Trying host %s ...\n"), host);
+	    cmd = newstralloc2(cmd, "HOST ", host);
+	    if (converse(cmd) == -1)
+		exit(1);
+	    if(server_happy())
+		found_host = 1;
+	}
+    }
+
+    if(found_host) {
 	dump_hostname = newstralloc(dump_hostname, host);
 	amfree(disk_name);
 	amfree(mount_point);
@@ -141,6 +167,7 @@ set_host(
 	clear_dir_list();
     }
     amfree(cmd);
+    amfree(uqhost);
 }
 
 void
@@ -161,22 +188,28 @@ set_disk(
 {
     char *cmd = NULL;
     char *qdsk;
+    char *uqdsk;
+    char *uqmtpt = NULL;
 
     if (is_extract_list_nonempty())
     {
-	printf("Must clear extract list before changing disk\n");
+	g_printf(_("Must clear extract list before changing disk\n"));
 	return;
     }
 
     /* if mount point specified, check it is valid */
-    if ((mtpt != NULL) && (*mtpt != '/'))
-    {
-	printf("Mount point \"%s\" invalid - must start with /\n", mtpt);
-	return;
+    if (mtpt != NULL) {
+	uqmtpt = unquote_string(mtpt);
+	if (*mtpt != '/') {
+	    g_printf(_("Mount point \"%s\" invalid - must start with /\n"), uqmtpt);
+	    amfree(uqmtpt);
+	    return;
+	}
     }
 
     clear_dir_list();
-    qdsk = quote_string(dsk);
+    uqdsk = unquote_string(dsk);
+    qdsk = quote_string(uqdsk);
     cmd = stralloc2("DISK ", qdsk);
     amfree(qdsk);
     if (converse(cmd) == -1)
@@ -186,14 +219,14 @@ set_disk(
     if (!server_happy())
 	return;
 
-    disk_name = newstralloc(disk_name, dsk);
+    disk_name = newstralloc(disk_name, uqdsk);
     if (mtpt == NULL)
     {
 	/* mount point not specified */
-	if (*dsk == '/')
+	if (*uqdsk == '/')
 	{
 	    /* disk specified by mount point, hence use it */
-	    mount_point = newstralloc(mount_point, dsk);
+	    mount_point = newstralloc(mount_point, uqdsk);
 	}
 	else
 	{
@@ -204,7 +237,7 @@ set_disk(
     else
     {
 	/* mount point specified */
-	mount_point = newstralloc(mount_point, mtpt);
+	mount_point = newstralloc(mount_point, uqmtpt);
     }
 
     /* set the working directory to the mount point */
@@ -221,11 +254,13 @@ set_disk(
     }
     else
     {
-	printf("No index records for disk for specified date\n");
-	printf("If date correct, notify system administrator\n");
+	g_printf(_("No index records for disk for specified date\n"));
+	g_printf(_("If date correct, notify system administrator\n"));
 	disk_path = newstralloc(disk_path, "/");	/* fake it */
 	clear_dir_list();
     }
+    amfree(uqmtpt);
+    amfree(uqdsk);
 }
 
 void
@@ -233,11 +268,13 @@ list_disk(
     char *	amdevice)
 {
     char *cmd = NULL;
-    char *qamdevice;
+    char *qamdevice, *uqamdevice;
 
     if(amdevice) {
-	qamdevice = quote_string(amdevice);
+	uqamdevice = unquote_string(amdevice);
+	qamdevice = quote_string(uqamdevice);
 	cmd = stralloc2("LISTDISK ", qamdevice);
+	amfree(uqamdevice);
 	amfree(qamdevice);
 	if (converse(cmd) == -1)
 	    exit(1);
@@ -251,6 +288,17 @@ list_disk(
     }
 }
 
+void
+local_cd(
+    char *dir)
+{
+    char *uqdir = unquote_string(dir);
+    if (chdir(uqdir) == -1) {
+	perror(uqdir);
+    }
+    amfree(uqdir);
+}
+
 void
 cd_glob(
     char *	glob)
@@ -258,18 +306,20 @@ cd_glob(
     char *regex;
     char *regex_path;
     char *s;
+    char *uqglob;
 
     char *path_on_disk = NULL;
 
     if (disk_name == NULL) {
-	printf("Must select disk before changing directory\n");
+	g_printf(_("Must select disk before changing directory\n"));
 	return;
     }
 
-    regex = glob_to_regex(glob);
-    dbprintf(("cd_glob (%s) -> %s\n", glob, regex));
+    uqglob = unquote_string(glob);
+    regex = glob_to_regex(uqglob);
+    dbprintf(_("cd_glob (%s) -> %s\n"), uqglob, regex);
     if ((s = validate_regexp(regex)) != NULL) {
-        printf("\"%s\" is not a valid shell wildcard pattern: ", glob);
+        g_printf(_("\"%s\" is not a valid shell wildcard pattern: "), glob);
         puts(s);
 	amfree(regex);
         return;
@@ -296,10 +346,11 @@ cd_glob(
         amfree(clean_disk_path);
     }
 
-    cd_dir(path_on_disk, glob);
+    cd_dir(path_on_disk, uqglob);
 
     amfree(regex_path);
     amfree(path_on_disk);
+    amfree(uqglob);
 }
 
 void
@@ -307,32 +358,52 @@ cd_regex(
     char *	regex)
 {
     char *s;
+    char *uq_orig_regex;
+    char *uqregex;
+    int  len_uqregex;
 
     char *path_on_disk = NULL;
 
     if (disk_name == NULL) {
-	printf("Must select disk before changing directory\n");
+	g_printf(_("Must select disk before changing directory\n"));
 	return;
     }
 
-    if ((s = validate_regexp(regex)) != NULL) {
-	printf("\"%s\" is not a valid regular expression: ", regex);
+    uq_orig_regex = unquote_string(regex);
+    uqregex = stralloc(uq_orig_regex);
+
+    /* Add a terminating '/' if it is not there, maybe before a '$' */
+    len_uqregex = strlen(uqregex);
+    if (uqregex[len_uqregex-1] == '$') {
+	if (uqregex[len_uqregex-2] != '/') {
+	    uqregex[len_uqregex-1] = '\0';
+	    strappend(uqregex, "/$");
+	}
+    } else if (uqregex[len_uqregex-1] != '/') {
+	//uqregex[len_uqregex-1] = '\0';
+	strappend(uqregex, "/");
+    }
+    if ((s = validate_regexp(uqregex)) != NULL) {
+	g_printf(_("\"%s\" is not a valid regular expression: "), uq_orig_regex);
+	amfree(uqregex);
 	puts(s);
 	return;
     }
 
     /* convert path (assumed in cwd) to one on disk */
     if (strcmp(disk_path, "/") == 0)
-        path_on_disk = stralloc2("/", regex);
+        path_on_disk = stralloc2("/", uqregex);
     else {
         char *clean_disk_path = clean_regex(disk_path);
         path_on_disk = vstralloc(clean_disk_path, "/", regex, NULL);
         amfree(clean_disk_path);
     }
 
-    cd_dir(path_on_disk, regex);
+    cd_dir(path_on_disk, uq_orig_regex);
 
     amfree(path_on_disk);
+    amfree(uqregex);
+    amfree(uq_orig_regex);
 }
 
 void
@@ -340,23 +411,24 @@ cd_dir(
     char *	path_on_disk,
     char *	default_dir)
 {
-    char *path_on_disk_slash = NULL;
     char *dir = NULL;
-
+    char *s;
     int nb_found;
     size_t i;
 
     DIR_ITEM *ditem;
 
-    path_on_disk_slash = stralloc2(path_on_disk, "/");
+    if ((s = validate_regexp(path_on_disk)) != NULL) {
+	set_directory(default_dir);
+	return;
+    }
 
     nb_found = 0;
 
     for (ditem=get_dir_list(); ditem!=NULL && nb_found <= 1; 
 			       ditem=get_next_dir_item(ditem))
     {
-	if (match(path_on_disk, ditem->path)
-	    || match(path_on_disk_slash, ditem->path))
+	if (match(path_on_disk, ditem->path))
 	{
 	    i = strlen(ditem->path);
 	    if((i > 0 && ditem->path[i-1] == '/')
@@ -378,7 +450,6 @@ cd_dir(
 	    }
 	}
     }
-    amfree(path_on_disk_slash);
 
     if(nb_found==0) {
 	set_directory(default_dir);
@@ -387,7 +458,7 @@ cd_dir(
 	set_directory(dir);
     }
     else {
-	printf("Too many directory\n");
+	g_printf(_("Too many directories\n"));
     }
     amfree(dir);
 }
@@ -410,7 +481,7 @@ set_directory(
     }
 
     if (disk_name == NULL) {
-	printf("Must select disk before setting directory\n");
+	g_printf(_("Must select disk before setting directory\n"));
 	return;
 	/*NOTREACHED*/
     }
@@ -430,7 +501,7 @@ set_directory(
 	{
 	    if (strncmp(mount_point, ldir, strlen(mount_point)) != 0)
 	    {
-		printf("Invalid directory - Can't cd outside mount point \"%s\"\n",
+		g_printf(_("Invalid directory - Can't cd outside mount point \"%s\"\n"),
 		       mount_point);
 		amfree(ldir);
 		return;
@@ -466,7 +537,7 @@ set_directory(
 	if (strcmp(dp, "..") == 0) {
 	    if (strcmp(new_dir, "/") == 0) {
 		/* at top of disk */
-		printf("Invalid directory - Can't cd outside mount point \"%s\"\n",
+		g_printf(_("Invalid directory - Can't cd outside mount point \"%s\"\n"),
 		       mount_point);
 		/*@ignore@*/
 		amfree(new_dir);
@@ -512,7 +583,7 @@ set_directory(
     }
     else
     {
-	printf("Invalid directory - %s\n", dir);
+	g_printf(_("Invalid directory - %s\n"), dir);
     }
 
     /*@ignore@*/
@@ -527,62 +598,92 @@ void
 show_directory(void)
 {
     if (mount_point == NULL || disk_path == NULL)
-        printf("Must select disk first\n");
+        g_printf(_("Must select disk first\n"));
     else if (strcmp(mount_point, "/") == 0)
-	printf("%s\n", disk_path);
+	g_printf("%s\n", disk_path);
     else if (strcmp(disk_path, "/") == 0)
-	printf("%s\n", mount_point);
+	g_printf("%s\n", mount_point);
     else
-	printf("%s%s\n", mount_point, disk_path);
+	g_printf("%s%s\n", mount_point, disk_path);
 }
 
 
-/* set the tape server and device */
+/* set the tape server and device (deprecated version) */
 void
 set_tape(
     char *	tape)
 {
-    char *tapedev = strchr(tape, ':');
+    char *uqtape = unquote_string(tape);
+    char *tapedev = strchr(uqtape, ':');
+    char *host = NULL;
+
+    g_printf(_("NOTE: 'settape' is deprecated; use setdevice instead.\n"));
 
     if (tapedev)
     {
-	if (tapedev != tape) {
+	/* This command is deprecated because this parsing is going to fall 
+	 * behind the list of available device names at some point, or to shadow
+	 * an interesting hostname (wouldn't 'tape' be a good name for a 
+	 * tape server?) */
+	if (tapedev != uqtape) {
 	    if((strchr(tapedev+1, ':') == NULL) &&
-	       (strncmp(tape, "null:", 5) == 0 ||
-		strncmp(tape, "rait:", 5) == 0 ||
-		strncmp(tape, "file:", 5) == 0 ||
-		strncmp(tape, "tape:", 5) == 0)) {
-		tapedev = tape;
+	       (strncmp_const(uqtape, "null:") == 0 ||
+		strncmp_const(uqtape, "rait:") == 0 ||
+		strncmp_const(uqtape, "file:") == 0 ||
+		strncmp_const(uqtape, "s3:") == 0 ||
+		strncmp_const(uqtape, "tape:") == 0)) {
+		tapedev = uqtape;
 	    }
 	    else {
 		*tapedev = '\0';
-		tape_server_name = newstralloc(tape_server_name, tape);
+		host = stralloc(uqtape);
 		++tapedev;
 	    }
-	} else { /* reset server_name if start with : */
-	    amfree(tape_server_name);
+	} else {
 	    ++tapedev;
 	}
     } else
-	tapedev = tape;
+	tapedev = uqtape;
     
     if (tapedev[0])
     {
 	if (strcmp(tapedev, "default") == 0)
-	    amfree(tape_device_name);
-	else
-	    tape_device_name = newstralloc(tape_device_name, tapedev);
+	    tapedev = NULL;
     }
 
+    /* call out to the new version */
+    set_device(host, tapedev);
+
+    amfree(host);
+    amfree(uqtape);
+}
+
+/* set the tape server and device, for real */
+void
+set_device(
+    char *	host,
+    char *	device)
+{
+    if (host)
+	tape_server_name = newstralloc(tape_server_name, host);
+    else
+	amfree(tape_server_name);
+
+    if (device)
+	tape_device_name = newstralloc(tape_device_name, device);
+    else
+	amfree(tape_device_name);
+
+    /* print the current status */
     if (tape_device_name)
-	printf ("Using tape \"%s\"", tape_device_name);
+	g_printf (_("Using tape \"%s\""), tape_device_name);
     else
-	printf ("Using default tape");
+	g_printf (_("Using default tape"));
 
     if (tape_server_name)
-	printf (" from server %s.\n", tape_server_name);
+	g_printf (_(" from server %s.\n"), tape_server_name);
     else
-	printf (".\nTape server unspecified, assumed to be %s.\n",
+	g_printf (_(".\nTape server unspecified, assumed to be %s.\n"),
 		server_name);
 }
 
@@ -592,11 +693,11 @@ set_mode(
 {
 #ifdef SAMBA_CLIENT
   if (mode == SAMBA_SMBCLIENT) {
-    printf ("SAMBA dumps will be extracted using smbclient\n");
+    g_printf (_("SAMBA dumps will be extracted using smbclient\n"));
     samba_extract_method = SAMBA_SMBCLIENT;
   } else {
     if (mode == SAMBA_TAR) {
-      printf ("SAMBA dumps will be extracted as TAR dumps\n");
+      g_printf (_("SAMBA dumps will be extracted as TAR dumps\n"));
       samba_extract_method = SAMBA_TAR;
     }
   }
@@ -609,12 +710,12 @@ void
 show_mode(void) 
 {
 #ifdef SAMBA_CLIENT
-  printf ("SAMBA dumps are extracted ");
+  g_printf (_("SAMBA dumps are extracted "));
 
   if (samba_extract_method == SAMBA_TAR) {
-    printf (" as TAR dumps\n");
+    g_printf (_(" as TAR dumps\n"));
   } else {
-    printf ("using smbclient\n");
+    g_printf (_("using smbclient\n"));
   }
 #endif /* SAMBA_CLIENT */
 }