- upgrade script update

git-svn-id: http://opensvn.csie.org/pttbbs/trunk/pttbbs@3973 63ad8ddf-47c3-0310-b6dd-a9e9d9715204

3 files changed, 6 insertions, 4 deletions

diff --git a/upgrade/Makefile b/upgrade/Makefile
index d050eba1..98903405 100644
--- a/upgrade/Makefile
+++ b/upgrade/Makefile
@@ -18,9 +18,7 @@ LIBS+=  $(SRCROOT)/src/libbbsutil/libbbsutil.a \
 
 all:
 	echo "Usually you won't build everything for upgrading, so we let you decide what to run."
+	echo "Please type make rDDDD_XXXX to build your upgrade program."
 
 $(SRCROOT)/include/var.h: $(SRCROOT)/mbbsd/var.c
 	cd $(SRCROOT)/mbbsd; $(MAKE) $(SRCROOT)/include/var.h
-
-r2014convert: r2014convert.c
-	$(CCACHE) ${CC} ${CFLAGS} ${LDFLAGS} -o r2014convert r2014convert.c $(LIBS)
diff --git a/upgrade/r2014convert.c b/upgrade/r2014_angel.c
index 14de742b..14de742b 100644
--- a/upgrade/r2014convert.c
+++ b/upgrade/r2014_angel.c
diff --git a/upgrade/r3968_chicken.c b/upgrade/r3968_chicken.c
index 740f42fe..70d90def 100644
--- a/upgrade/r3968_chicken.c
+++ b/upgrade/r3968_chicken.c
@@ -73,14 +73,17 @@ int main()
     FILE *fp = fopen(FN_PASSWD, "rb"), *fp2 = NULL;
     char fn[PATHLEN];
     old_userec_t u;
+    int i;
 
     if (!fp) {
 	printf("cannot load password file. abort.\n");
 	return -1;
     }
 
+    i = 0;
     while (fread(&u, sizeof(u), 1, fp) > 0)
     {
+	i++;
 	if (!u.userid[0])
 	    continue;
 	if (!u.mychicken.name[0])
@@ -102,7 +105,8 @@ int main()
 	    unlink(fn);
 	}
 	else
-	    printf("Transferred chicken data OK: %s.\n", u.userid);
+	    // printf("Transferred chicken data OK: %s.\n", u.userid);
+	    ;
 	fclose(fp2); fp2 = NULL;
     }
     fclose(fp);