ctdlmigrate now uses the new directory semantics

[citadel.git] / citadel / utils / ctdlmigrate.c

diff --git a/citadel/utils/ctdlmigrate.c b/citadel/utils/ctdlmigrate.c
index baa5f6de70231f27fec183bb886f413ee8642175..21dad4b24f87f331956542a95ced05e13db28ace 100644 (file)
--- 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-2012 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
 
 
 
@@ -69,11 +66,7 @@ void getz(char *buf) {
 
 
 
-int main(int argc, char *argv[])
-{
-       int relh=0;
-       int home=0;
-       char relhome[PATH_MAX]="";
+int main(int argc, char *argv[]) {
        char ctdldir[PATH_MAX]=CTDLDIR;
        char yesno[5];
        char sendcommand[PATH_MAX];
@@ -90,11 +83,15 @@ 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);
+       if (chdir(ctdldir) != 0) {
+               fprintf(stderr, "sendcommand: %s: %s\n", ctdldir, strerror(errno));
+               exit(errno);
+       }
+
 
-       cmdexit = system("clear");
-       printf( "-------------------------------------------\n"
+       printf( "\033[2J\033[H\n"
+               "-------------------------------------------\n"
                "Over-the-wire migration utility for Citadel\n"
                "-------------------------------------------\n"
                "\n"
@@ -102,7 +99,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 +108,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,38 +244,18 @@ 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);
                }
-               else if (!strncasecmp(buf, "netconfigs|", 11)) {
-                       snprintf(cmd, sizeof cmd, "rsync -va --rsh='ssh -S %s' %s@%s:%s/ %s/",
-                               socket_path, remote_user, remote_host, &buf[11], ctdl_netcfg_dir);
-               }
                else if (!strncasecmp(buf, "keys|", 5)) {
                        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 */
                }