* Finished the migratenet utility (finally).

diff --git a/citadel/ChangeLog b/citadel/ChangeLog
index 383a1edf25badf4e842a0a7080a1be4a8c98ca79..e71ae5ae32744c128fc91e843b8d05af330bc3af 100644 (file)
--- a/citadel/ChangeLog
+++ b/citadel/ChangeLog
@@ -1,4 +1,7 @@
  $Log$
+ Revision 580.71  2001/10/29 16:39:54  ajc
+ * Finished the migratenet utility (finally).
+
  Revision 580.70  2001/10/28 05:18:51  ajc
  * migratenet almost finished
 
@@ -2843,4 +2846,3 @@ Sat Jul 11 00:20:48 EDT 1998 Nathan Bryant <bryant@cs.usm.maine.edu>
 
 Fri Jul 10 1998 Art Cancro <ajc@uncensored.citadel.org>
        * Initial CVS import 
-

diff --git a/citadel/migratenet.c b/citadel/migratenet.c
index 74219ae58e050f36e3c329fe1aa35174b2170aba..e58db330e1180fd05329dbdda761fe386e517f26 100644 (file)
--- a/citadel/migratenet.c
+++ b/citadel/migratenet.c
@@ -167,7 +167,7 @@ int main(int argc, char **argv)
 
        /* Now go through the table looking for node names to enter */
 
-       sprintf(buf, "cat %s |awk '{ FS=\"|\"; print $2 }' |sort -f |uniq -i",
+       sprintf(buf, "cat %s |awk -F \"|\" '{ print $2 }' |sort -f |uniq -i",
                roomfilename);
        roomfp = popen(buf, "r");
        if (roomfp == NULL) {
@@ -195,6 +195,7 @@ int main(int argc, char **argv)
                sprintf(buf, "GOTO %s", mn->roomname);
                serv_puts(buf);
                serv_gets(buf);
+               printf("%s\n", &buf[4]);
                if (buf[0] != '2') goto roomerror;
 
                serv_puts("SNET");
@@ -229,5 +230,19 @@ roomerror: /* free this record */
 
        unlink(roomfilename);
        unlink(nodefilename);
-       return(0);
+
+       printf("\n\n"
+               "If this conversion was successful, you do not need your\n"
+               "old network configuration files.  Delete them now? "
+       );
+
+       gets(buf);
+       if (tolower(buf[0]) != 'y') exit(0);
+
+       get_config();
+       system("rm -fr ./network/systems");
+       system("rm -f ./network/mail.sysinfo");
+       system("rm -f ./network/internetmail.config");
+
+       exit(0);
 }