caleb-brown/redict
1
0
Fork 0
mirror of https://codeberg.org/redict/redict.git synced 2025-01-23 08:38:27 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'issue_193' of git://github.com/gnrfan/redis

Browse Source
This commit is contained in:
antirez 2010-03-22 17:29:20 +01:00
commit 7bf90179a3
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
redis.c
View File

@ -1616,12 +1616,15 @@ static void loadServerConfig(char *filename) {
char buf[REDIS_CONFIGLINE_MAX+1], *err = NULL; char buf[REDIS_CONFIGLINE_MAX+1], *err = NULL;
int linenum = 0; int linenum = 0;
sds line = NULL; sds line = NULL;
char *errormsg = "Fatal error, can't open config file '%s'";
char *errorbuf = zmalloc(sizeof(char)*(strlen(errormsg)+strlen(filename)));
sprintf(errorbuf, errormsg, filename);
if (filename[0] == '-' && filename[1] == '\0') if (filename[0] == '-' && filename[1] == '\0')
fp = stdin; fp = stdin;
else { else {
if ((fp = fopen(filename,"r")) == NULL) { if ((fp = fopen(filename,"r")) == NULL) {
redisLog(REDIS_WARNING,"Fatal error, can't open config file"); redisLog(REDIS_WARNING, errorbuf);
exit(1); exit(1);
} }
} }