aboutsummaryrefslogtreecommitdiffstats
path: root/FICS/playerdb.c
diff options
context:
space:
mode:
Diffstat (limited to 'FICS/playerdb.c')
-rw-r--r--FICS/playerdb.c57
1 files changed, 36 insertions, 21 deletions
diff --git a/FICS/playerdb.c b/FICS/playerdb.c
index f84dfe4..5888078 100644
--- a/FICS/playerdb.c
+++ b/FICS/playerdb.c
@@ -75,6 +75,21 @@ player_num_ok_chk(const int num)
num < (int)ARRAY_SIZE(parray));
}
+PUBLIC void
+xrename(const char *fn, const char *name1, const char *name2)
+{
+ if (fn == NULL || name1 == NULL || name2 == NULL) {
+ errno = EINVAL;
+ warn("%s", __func__);
+ return;
+ }
+
+ errno = 0;
+
+ if (rename(name1, name2) != 0)
+ warn("%s: '%s' -> '%s'", fn, name1, name2);
+}
+
PRIVATE int
get_empty_slot(void)
{
@@ -1104,7 +1119,7 @@ player_markdeleted(int p)
parray[p].login[0], parray[p].login);
snprintf(fname2, sizeof fname2, "%s/%c/%s.delete", player_dir,
parray[p].login[0], parray[p].login);
- rename(fname, fname2);
+ xrename(__func__, fname, fname2);
if ((fp = fopen(fname2, "a")) != NULL) { // Touch the file
fprintf(fp, "\n");
@@ -2886,7 +2901,7 @@ player_kill(char *name)
name);
snprintf(fname2, sizeof fname2, "%s/%c/.rem.%s", player_dir, name[0],
name);
- rename(fname, fname2);
+ xrename(__func__, fname, fname2);
RemHist(name);
@@ -2894,25 +2909,25 @@ player_kill(char *name)
stats_dir, name[0], name);
snprintf(fname2, sizeof fname2, "%s/player_data/%c/.rem.%s.games",
stats_dir, name[0], name);
- rename(fname, fname2);
+ xrename(__func__, fname, fname2);
snprintf(fname, sizeof fname, "%s/player_data/%c/%s.comments",
stats_dir, name[0], name);
snprintf(fname2, sizeof fname2, "%s/player_data/%c/.rem.%s.comments",
stats_dir, name[0], name);
- rename(fname, fname2);
+ xrename(__func__, fname, fname2);
snprintf(fname, sizeof fname, "%s/player_data/%c/%s.logons",
stats_dir, name[0], name);
snprintf(fname2, sizeof fname2, "%s/player_data/%c/.rem.%s.logons",
stats_dir, name[0], name);
- rename(fname, fname2);
+ xrename(__func__, fname, fname2);
snprintf(fname, sizeof fname, "%s/player_data/%c/%s.messages",
stats_dir, name[0], name);
snprintf(fname2, sizeof fname2, "%s/player_data/%c/.rem.%s.messages",
stats_dir, name[0], name);
- rename(fname, fname2);
+ xrename(__func__, fname, fname2);
return 0;
}
@@ -2927,31 +2942,31 @@ player_rename(char *name, char *newname)
name);
snprintf(fname2, sizeof fname2, "%s/%c/%s", player_dir, newname[0],
newname);
- rename(fname, fname2);
+ xrename(__func__, fname, fname2);
snprintf(fname, sizeof fname, "%s/player_data/%c/%s.games",
stats_dir, name[0], name);
snprintf(fname2, sizeof fname2, "%s/player_data/%c/%s.games",
stats_dir, newname[0], newname);
- rename(fname, fname2);
+ xrename(__func__, fname, fname2);
snprintf(fname, sizeof fname, "%s/player_data/%c/%s.comments",
stats_dir, name[0], name);
snprintf(fname2, sizeof fname2, "%s/player_data/%c/%s.comments",
stats_dir, newname[0], newname);
- rename(fname, fname2);
+ xrename(__func__, fname, fname2);
snprintf(fname, sizeof fname, "%s/player_data/%c/%s.logons",
stats_dir, name[0], name);
snprintf(fname2, sizeof fname2, "%s/player_data/%c/%s.logons",
stats_dir, newname[0], newname);
- rename(fname, fname2);
+ xrename(__func__, fname, fname2);
snprintf(fname, sizeof fname, "%s/player_data/%c/%s.messages",
stats_dir, name[0], name);
snprintf(fname2, sizeof fname2, "%s/player_data/%c/%s.messages",
stats_dir, newname[0], newname);
- rename(fname, fname2);
+ xrename(__func__, fname, fname2);
return 0;
}
@@ -2966,31 +2981,31 @@ player_raise(char *name)
name[0], name);
snprintf(fname2, sizeof fname2, "%s/%c/.rem.%s", player_dir,
name[0], name);
- rename(fname2, fname);
+ xrename(__func__, fname2, fname);
snprintf(fname, sizeof fname, "%s/player_data/%c/%s.games",
stats_dir, name[0], name);
snprintf(fname2, sizeof fname2, "%s/player_data/%c/.rem.%s.games",
stats_dir, name[0], name);
- rename(fname2, fname);
+ xrename(__func__, fname2, fname);
snprintf(fname, sizeof fname, "%s/player_data/%c/%s.comments",
stats_dir, name[0], name);
snprintf(fname2, sizeof fname2, "%s/player_data/%c/.rem.%s.comments",
stats_dir, name[0], name);
- rename(fname2, fname);
+ xrename(__func__, fname2, fname);
snprintf(fname, sizeof fname, "%s/player_data/%c/%s.logons",
stats_dir, name[0], name);
snprintf(fname2, sizeof fname2, "%s/player_data/%c/.rem.%s.logons",
stats_dir, name[0], name);
- rename(fname2, fname);
+ xrename(__func__, fname2, fname);
snprintf(fname, sizeof fname, "%s/player_data/%c/%s.messages",
stats_dir, name[0], name);
snprintf(fname2, sizeof fname2, "%s/player_data/%c/.rem.%s.messages",
stats_dir, name[0], name);
- rename(fname2, fname);
+ xrename(__func__, fname2, fname);
return 0;
}
@@ -3005,31 +3020,31 @@ player_reincarn(char *name, char *newname)
newname[0], newname);
snprintf(fname2, sizeof fname2, "%s/%c/.rem.%s", player_dir,
name[0], name);
- rename(fname2, fname);
+ xrename(__func__, fname2, fname);
snprintf(fname, sizeof fname, "%s/player_data/%c/%s.games",
stats_dir, newname[0], newname);
snprintf(fname2, sizeof fname2, "%s/player_data/%c/.rem.%s.games",
stats_dir, name[0], name);
- rename(fname2, fname);
+ xrename(__func__, fname2, fname);
snprintf(fname, sizeof fname, "%s/player_data/%c/%s.comments",
stats_dir, newname[0], newname);
snprintf(fname2, sizeof fname2, "%s/player_data/%c/.rem.%s.comments",
stats_dir, name[0], name);
- rename(fname2, fname);
+ xrename(__func__, fname2, fname);
snprintf(fname, sizeof fname, "%s/player_data/%c/%s.logons",
stats_dir, newname[0], newname);
snprintf(fname2, sizeof fname2, "%s/player_data/%c/.rem.%s.logons",
stats_dir, name[0], name);
- rename(fname2, fname);
+ xrename(__func__, fname2, fname);
snprintf(fname, sizeof fname, "%s/player_data/%c/%s.messages",
stats_dir, newname[0], newname);
snprintf(fname2, sizeof fname2, "%s/player_data/%c/.rem.%s.messages",
stats_dir, name[0], name);
- rename(fname2, fname);
+ xrename(__func__, fname2, fname);
return 0;
}