From 67ec840c3cc44e38e6d8724fa994ba6c81abb591 Mon Sep 17 00:00:00 2001 From: "John \"Elwin\" Edwards" Date: Sun, 23 Mar 2014 21:27:14 -0700 Subject: [PATCH] Don't truncate player name in savefile name or log message. The player name is stored in whoami[], which is length 80 in most games (1024 in rogue5). Only the first 10 chars were used to create file_name, because that buffer is the same length. Increasing the size of file_name to 256 permits using all of whoami. The name is also no longer truncated to 20 chars when writing the log. All games should now be able to handle 79-character names without collisions. Anything more would break save compatibility. --- arogue5/main.c | 4 ++-- arogue5/rip.c | 2 +- arogue5/rogue.c | 2 +- rogue3/init.c | 2 +- rogue3/main.c | 2 +- rogue3/rip.c | 4 ++-- rogue3/rogue.h | 2 +- rogue4/extern.c | 2 +- rogue4/main.c | 4 ++-- rogue4/rip.c | 4 ++-- rogue4/save.c | 2 +- rogue5/main.c | 2 +- rogue5/rip.c | 4 ++-- srogue/global.c | 2 +- srogue/main.c | 4 ++-- srogue/rip.c | 4 ++-- 16 files changed, 23 insertions(+), 23 deletions(-) diff --git a/arogue5/main.c b/arogue5/main.c index c581c25..0ed92bb 100644 --- a/arogue5/main.c +++ b/arogue5/main.c @@ -64,8 +64,8 @@ char **envp; use_savedir = TRUE; strncpy(whoami, argv[2], LINELEN); whoami[LINELEN - 1] = '\0'; - if (snprintf(file_name, LINELEN, "%s/%d-%.10s.ar5sav", SAVEDIR, - md_getuid(), whoami) >= LINELEN) + if (snprintf(file_name, 256, "%s/%d-%s.ar5sav", SAVEDIR, + md_getuid(), whoami) >= 256) { /* The name is too long */ use_savedir = FALSE; diff --git a/arogue5/rip.c b/arogue5/rip.c index a043a10..aa71368 100644 --- a/arogue5/rip.c +++ b/arogue5/rip.c @@ -614,7 +614,7 @@ void writelog(unsigned long amount, int flags, short monst) { perror(LOGFILE); return; } - fprintf(logfi, "%d %d %.20s %d %s %d %d %d %c %s\n", time(NULL), amount, + fprintf(logfi, "%d %d %s %d %s %d %d %d %c %s\n", time(NULL), amount, whoami, pstats.s_lvl, class, level, max_level, quest_item, had_quest, fate); fclose(logfi); diff --git a/arogue5/rogue.c b/arogue5/rogue.c index 24aa48f..9ec151c 100644 --- a/arogue5/rogue.c +++ b/arogue5/rogue.c @@ -84,7 +84,7 @@ char *r_guess[MAXRINGS]; /* Players guess at what ring is */ char *ws_guess[MAXSTICKS]; /* Players guess at what wand is */ char *m_guess[MAXMM]; /* Players guess at what MM is */ char *ws_type[MAXSTICKS]; /* Is it a wand or a staff */ -char file_name[LINELEN]; /* Save file name */ +char file_name[256]; /* Save file name */ char score_file[LINELEN]; /* Score file name */ char home[LINELEN]; /* User's home directory */ WINDOW *cw; /* Window that the player sees */ diff --git a/rogue3/init.c b/rogue3/init.c index 6f11be5..e979628 100644 --- a/rogue3/init.c +++ b/rogue3/init.c @@ -63,7 +63,7 @@ char *p_guess[MAXPOTIONS]; /* Players guess at what potion is */ char *r_guess[MAXRINGS]; /* Players guess at what ring is */ char *ws_guess[MAXSTICKS]; /* Players guess at what wand is */ char *ws_type[MAXSTICKS]; /* Is it a wand or a staff */ -char file_name[80]; /* Save file name */ +char file_name[256]; /* Save file name */ char home[PATH_MAX]; /* User's home directory */ unsigned char prbuf[80]; /* Buffer for sprintfs */ int max_hp; /* Player's max hit points */ diff --git a/rogue3/main.c b/rogue3/main.c index 739b527..c85e2a8 100644 --- a/rogue3/main.c +++ b/rogue3/main.c @@ -71,7 +71,7 @@ char **envp; whoami[79] = '\0'; use_savedir = TRUE; /* look for savefile at SAVEDIR/UID-playername.r3sav */ - if (snprintf(file_name, 80, "%s/%d-%.10s.r3sav", SAVEDIR, md_getuid(), whoami) >= 80) + if (snprintf(file_name, 256, "%s/%d-%s.r3sav", SAVEDIR, md_getuid(), whoami) >= 256) { /* this shouldn't happen */ strcpy(file_name, "rogue3.save"); diff --git a/rogue3/rip.c b/rogue3/rip.c index 4d1628a..b34a6d9 100644 --- a/rogue3/rip.c +++ b/rogue3/rip.c @@ -308,13 +308,13 @@ score(int amount, int flags, int monst) void writelog(int amount, int flags, int monst) { - char logmessage[160], ltemp[80]; + char logmessage[220], ltemp[80]; char *killer; if (waswizard) return; #ifdef LOGFILE - sprintf(logmessage, "%d %d %.20s %d ", time(NULL), amount, whoami, + sprintf(logmessage, "%d %d %s %d ", time(NULL), amount, whoami, pstats.s_lvl); if (flags == 0) /* died */ { diff --git a/rogue3/rogue.h b/rogue3/rogue.h index 375cc8c..33a91e2 100644 --- a/rogue3/rogue.h +++ b/rogue3/rogue.h @@ -428,7 +428,7 @@ extern int dnum; /* Dungeon number */ extern int door_stop; /* Stop running when we pass a door */ extern struct delayed_action d_list[20]; extern int fight_flush; /* True if toilet input */ -extern char file_name[80]; /* Save file name */ +extern char file_name[256]; /* Save file name */ extern int firstmove; /* First move after setting door_stop */ extern int food_left; /* Amount of food in hero's stomach */ extern char fruit[80]; /* Favorite fruit */ diff --git a/rogue4/extern.c b/rogue4/extern.c index f7123d8..017180c 100644 --- a/rogue4/extern.c +++ b/rogue4/extern.c @@ -77,7 +77,7 @@ char *p_guess[MAXPOTIONS]; /* Players guess at what potion is */ char *r_guess[MAXRINGS]; /* Players guess at what ring is */ char *ws_guess[MAXSTICKS]; /* Players guess at what wand is */ char *ws_type[MAXSTICKS]; /* Is it a wand or a staff */ -char file_name[MAXSTR]; /* Save file name */ +char file_name[256]; /* Save file name */ char home[MAXSTR]; /* User's home directory */ char _level[MAXLINES*MAXCOLS]; /* Level map */ char _flags[MAXLINES*MAXCOLS]; /* Flags for each space on the map */ diff --git a/rogue4/main.c b/rogue4/main.c index e439e0c..404d623 100644 --- a/rogue4/main.c +++ b/rogue4/main.c @@ -78,8 +78,8 @@ char **envp; whoami[MAXSTR - 1] = '\0'; /* insurance */ use_savedir = TRUE; /* look for savefile at SAVEDIR/UID-playername.r4sav */ - if (snprintf(file_name, MAXSTR, "%s/%d-%.10s.r4sav", SAVEDIR, - md_getuid(), whoami) >= MAXSTR) + if (snprintf(file_name, 256, "%s/%d-%s.r4sav", SAVEDIR, + md_getuid(), whoami) >= 256) { /* Name is too long- this shouldn't happen */ strcpy(file_name, "rogue4.save"); diff --git a/rogue4/rip.c b/rogue4/rip.c index be02238..73d25be 100644 --- a/rogue4/rip.c +++ b/rogue4/rip.c @@ -239,7 +239,7 @@ char monst; void writelog(int amount, int flags, char monst) { FILE *logfi; - char logmessage[160], ltemp[80]; + char logmessage[220], ltemp[80]; char *killer; if (noscore) return; @@ -251,7 +251,7 @@ void writelog(int amount, int flags, char monst) if (logfi == NULL) return; /* otherwise writing should work */ - sprintf(logmessage, "%d %d %.20s %d ", time(NULL), amount, whoami, + sprintf(logmessage, "%d %d %s %d ", time(NULL), amount, whoami, pstats.s_lvl); if (flags == 0) /* died */ { diff --git a/rogue4/save.c b/rogue4/save.c index 9cecb4e..608f0b5 100644 --- a/rogue4/save.c +++ b/rogue4/save.c @@ -37,7 +37,7 @@ save_game() { register FILE *savef; register int c; - char buf[MAXSTR]; + char buf[256]; /* * get file name diff --git a/rogue5/main.c b/rogue5/main.c index 4d8cee7..186b8f6 100644 --- a/rogue5/main.c +++ b/rogue5/main.c @@ -49,7 +49,7 @@ main(int argc, char **argv) use_savedir = TRUE; strncpy(whoami, argv[2], MAXSTR); whoami[MAXSTR-1] = '\0'; - snprintf(file_name, MAXSTR, "%s/%d-%.10s.r5sav", SAVEDIR, + snprintf(file_name, MAXSTR, "%s/%d-%.80s.r5sav", SAVEDIR, md_getuid(), whoami); } #endif diff --git a/rogue5/rip.c b/rogue5/rip.c index 8bbbe1d..9d4e9f8 100644 --- a/rogue5/rip.c +++ b/rogue5/rip.c @@ -226,7 +226,7 @@ score(int amount, int flags, int monst) void writelog(int amount, int flags, int monst) { #ifdef LOGFILE - char logmessage[160], ltemp[80]; + char logmessage[220], ltemp[80]; if (logfi == NULL) return; @@ -237,7 +237,7 @@ void writelog(int amount, int flags, int monst) return; } #endif - sprintf(logmessage, "%d %d %.20s %d ", time(NULL), amount, whoami, + sprintf(logmessage, "%d %d %.80s %d ", time(NULL), amount, whoami, pstats.s_lvl); if (flags == 0) /* dead */ { diff --git a/srogue/global.c b/srogue/global.c index 246068f..ce3fecb 100644 --- a/srogue/global.c +++ b/srogue/global.c @@ -62,7 +62,7 @@ char prbuf[LINLEN]; /* Buffer for sprintfs */ char whoami[LINLEN]; /* Name of player */ char fruit[LINLEN]; /* Favorite fruit */ char huh[LINLEN]; /* The last message printed */ -char file_name[LINLEN]; /* Save file name */ +char file_name[256]; /* Save file name */ char scorefile[LINLEN]; /* place for scorefile */ char home[LINLEN]; /* User's home directory */ char outbuf[BUFSIZ]; /* Output buffer for stdout */ diff --git a/srogue/main.c b/srogue/main.c index aebecb4..9af0fb6 100644 --- a/srogue/main.c +++ b/srogue/main.c @@ -119,8 +119,8 @@ char **envp; strncpy(whoami, argv[2], LINLEN); whoami[LINLEN - 1] = '\0'; use_savedir = TRUE; - if (snprintf(file_name, LINLEN, "%s/%d-%.10s.srsav", SAVEDIR, - playuid, whoami) >= LINLEN) { + if (snprintf(file_name, 256, "%s/%d-%s.srsav", SAVEDIR, + playuid, whoami) >= 256) { /* Just in case it doesn't fit */ strcpy(file_name, "srogue.save"); use_savedir = FALSE; diff --git a/srogue/rip.c b/srogue/rip.c index 2830fe2..b3be7dc 100644 --- a/srogue/rip.c +++ b/srogue/rip.c @@ -223,14 +223,14 @@ int amount, aflag; void writelog(int amount, int aflag, char monst) { - char logmessage[160], ltemp[80], mlev[40]; + char logmessage[220], ltemp[80], mlev[40]; char *killer; FILE *logfi; if (waswizard) return; #ifdef LOGFILE - sprintf(logmessage, "%d %d %.20s %d ", time(NULL), amount, whoami, + sprintf(logmessage, "%d %d %s %d ", time(NULL), amount, whoami, him->s_lvl); if (amulet) sprintf(mlev, " [max %d] with the Amulet", max_level);