warden/early-roguelike
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Don't truncate player name in savefile name or log message.

Browse source 
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.
This commit is contained in:
John "Elwin" Edwards 2014-03-23 21:27:14 -07:00
parent 082cd54126
commit 67ec840c3c
16 changed files with 23 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

4
arogue5/main.c
View file

@ -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;

2
arogue5/rip.c
View file

@ -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);

2
arogue5/rogue.c
View file

@ -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 */

2
rogue3/init.c
View file

@ -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 */

2
rogue3/main.c
View file

@ -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");

4
rogue3/rip.c
View file

@ -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 */
{

2
rogue3/rogue.h
View file

@ -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 */

2
rogue4/extern.c
View file

@ -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 */

4
rogue4/main.c
View file

@ -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");

4
rogue4/rip.c
View file

@ -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 */
{

2
rogue4/save.c
View file

@ -37,7 +37,7 @@ save_game()
{
register FILE *savef;
register int c;
char buf[MAXSTR];
char buf[256];
/*
* get file name

2
rogue5/main.c
View file

@ -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

4
rogue5/rip.c
View file

@ -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 */
{

2
srogue/global.c
View file

@ -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 */

4
srogue/main.c
View file

@ -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;

4
srogue/rip.c
View file

@ -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);