X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Futils%2Fctdlmigrate.c;h=5008cc5e4d89c1a0fdff98851b9f9b014a11eab8;hb=a520d904d0069654c57d2b69618bee1225ee3067;hp=18b10f511bcc50b1898e3471afcf0b513394870b;hpb=2807ad968981de0aae10473ee5fbd7a4c0d513bd;p=citadel.git

diff --git a/citadel/utils/ctdlmigrate.c b/citadel/utils/ctdlmigrate.c
index 18b10f511..5008cc5e4 100644
--- a/citadel/utils/ctdlmigrate.c
+++ b/citadel/utils/ctdlmigrate.c
@@ -5,7 +5,7 @@
  * The scope of this program isn't wide enough to make a difference.  If you don't like
  * it you can rewrite it.
  *
- * Copyright (c) 2009-2016 citadel.org
+ * Copyright (c) 2009-2021 citadel.org
  *
  * This program is open source software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3.
@@ -41,9 +41,6 @@
 #include "sysdep.h"
 #include "config.h"
 #include "citadel_dirs.h"
-#if HAVE_BACKTRACE
-#include <execinfo.h>
-#endif
 
 
 
@@ -90,7 +87,6 @@ int main(int argc, char *argv[])
 	char spinning[4] = "-\\|/" ;
 	int exitcode = 0;
 	
-	calc_dirs_n_files(relh, home, relhome, ctdldir, 0);
 	CtdlMakeTempFileName(socket_path, sizeof socket_path);
 
 	cmdexit = system("clear");
@@ -102,7 +98,7 @@ int main(int argc, char *argv[])
 		"to a new host system via a network connection, without disturbing\n"
 		"the source system.  The target may be a different CPU architecture\n"
 		"and/or operating system.  The source system should be running\n"
-		"Citadel %d.%02d or newer, and the target system should be running\n"
+		"Citadel version %d or newer, and the target system should be running\n"
 		"either the same version or a newer version.  You will also need\n"
 		"the 'rsync' utility, and OpenSSH v4 or newer.\n"
 		"\n"
@@ -111,8 +107,7 @@ int main(int argc, char *argv[])
 		"\n"
 		"Do you wish to continue? "
 		,
-		EXPORT_REV_MIN / 100,
-		EXPORT_REV_MIN % 100
+		EXPORT_REV_MIN
 	);
 
 	if ((fgets(yesno, sizeof yesno, stdin) == NULL) || (tolower(yesno[0]) != 'y')) {
@@ -248,18 +243,10 @@ FAIL:	if (sourcefp) pclose(sourcefp);
 	while ((fgets(buf, sizeof buf, sourcefp)) && (strcmp(buf, "000"))) {
 		buf[strlen(buf)-1] = 0;
 
-		if (!strncasecmp(buf, "bio|", 4)) {
-			snprintf(cmd, sizeof cmd, "rsync -va --rsh='ssh -S %s' %s@%s:%s/ %s/",
-				socket_path, remote_user, remote_host, &buf[4], ctdl_bio_dir);
-		}
-		else if (!strncasecmp(buf, "files|", 6)) {
+		if (!strncasecmp(buf, "files|", 6)) {
 			snprintf(cmd, sizeof cmd, "rsync -va --rsh='ssh -S %s' %s@%s:%s/ %s/",
 				socket_path, remote_user, remote_host, &buf[6], ctdl_file_dir);
 		}
-		else if (!strncasecmp(buf, "userpics|", 9)) {
-			snprintf(cmd, sizeof cmd, "rsync -va --rsh='ssh -S %s' %s@%s:%s/ %s/",
-				socket_path, remote_user, remote_host, &buf[9], ctdl_usrpic_dir);
-		}
 		else if (!strncasecmp(buf, "messages|", 9)) {
 			snprintf(cmd, sizeof cmd, "rsync -va --rsh='ssh -S %s' %s@%s:%s/ %s/",
 				socket_path, remote_user, remote_host, &buf[9], ctdl_message_dir);
@@ -268,14 +255,6 @@ FAIL:	if (sourcefp) pclose(sourcefp);
 			snprintf(cmd, sizeof cmd, "rsync -va --rsh='ssh -S %s' %s@%s:%s/ %s/",
 				socket_path, remote_user, remote_host, &buf[5], ctdl_key_dir);
 		}
-		else if (!strncasecmp(buf, "images|", 7)) {
-			snprintf(cmd, sizeof cmd, "rsync -va --rsh='ssh -S %s' %s@%s:%s/ %s/",
-				socket_path, remote_user, remote_host, &buf[7], ctdl_image_dir);
-		}
-		else if (!strncasecmp(buf, "info|", 5)) {
-			snprintf(cmd, sizeof cmd, "rsync -va --rsh='ssh -S %s' %s@%s:%s/ %s/",
-				socket_path, remote_user, remote_host, &buf[5], ctdl_info_dir);
-		}
 		else {
 			strcpy(cmd, "false");	/* cheap and sleazy way to throw an error */
 		}