From 36bfcbab4e0f0e34a1641bb9465300530ccec2e1 Mon Sep 17 00:00:00 2001 From: piaip Date: Fri, 14 Dec 2012 02:52:11 +0000 Subject: Provide verbose message to check for r5734 upgrade. git-svn-id: http://opensvn.csie.org/pttbbs/trunk@5736 63ad8ddf-47c3-0310-b6dd-a9e9d9715204 --- pttbbs/upgrade/r5734.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/pttbbs/upgrade/r5734.c b/pttbbs/upgrade/r5734.c index 65e406d2..b2f95d67 100644 --- a/pttbbs/upgrade/r5734.c +++ b/pttbbs/upgrade/r5734.c @@ -1,10 +1,17 @@ #define _UTIL_C_ #include "bbs.h" -#define CLEAR(x) memset(&(u->x), 0, sizeof(u->x)) +#define CLEAR(x) { \ + for (i = 0; i < sizeof(u->x); i++) \ + if (((char*)&(u->x))[i] != 0) \ + need_clear = 1; \ + memset(&(u->x), 0, sizeof(u->x)); \ +} int check(void *data, int n, userec_t *u) { + int i = 0; + int need_clear = 0; if (!u->userid[0]) return 0; fprintf(stderr, "%d\r", n); @@ -22,8 +29,12 @@ int check(void *data, int n, userec_t *u) CLEAR(_unused10); CLEAR(_unused11); CLEAR(_unused12); + // flush - passwd_update(n+1, u); + if (need_clear) { + printf("Clear: %s\n", u->userid); + passwd_update(n+1, u); + } return 0; } -- cgit v1.2.3