moparisthebest
/
hexchat
mirror of https://github.com/moparisthebest/hexchat
1
0
Fork 0
Code Issues Releases Wiki Activity

implement xchat_del_pluginpref

This commit is contained in:
Berke Viktor 2012-01-14 01:49:12 +01:00
parent c3821b6316
commit 17d13aa8d3
1 changed files with 38 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
src/common/plugin.c
View File

@ -1589,13 +1589,11 @@ xchat_free (xchat_plugin *ph, void *ptr)
} }
static int static int
xchat_set_pluginpref_str_real (xchat_plugin *pl, const char *var, const char *value, int mode) xchat_set_pluginpref_str_real (xchat_plugin *pl, const char *var, const char *value, int mode) /* mode: 0 = delete, 1 = save */
{ {
/* mode: 0 = delete, 1 = save */
FILE *fpIn; FILE *fpIn;
int fhOut; int fhOut;
int prevConfig; int prevSetting;
char confname[64]; char confname[64];
char confname_tmp[69]; char confname_tmp[69];
char buffer[512]; /* the same as in cfg_put_str */ char buffer[512]; /* the same as in cfg_put_str */
@ -1615,31 +1613,40 @@ xchat_set_pluginpref_str_real (xchat_plugin *pl, const char *var, const char *va
{ {
return 0; return 0;
} }
else if (fpIn == NULL) /* no previous config, no parsing */ else if (fpIn == NULL) /* no previous config file, no parsing */
{ {
sprintf (buffer, "%s = %s\n", var, value); if (mode)
write (fhOut, buffer, strlen (buffer)); {
close (fhOut); sprintf (buffer, "%s = %s\n", var, value);
write (fhOut, buffer, strlen (buffer));
close (fhOut);
sprintf (buffer, "%s/%s", get_xdir_fs (), confname); sprintf (buffer, "%s/%s", get_xdir_fs (), confname);
sprintf (buffer_tmp, "%s/%s", get_xdir_fs (), confname_tmp); sprintf (buffer_tmp, "%s/%s", get_xdir_fs (), confname_tmp);
#ifdef WIN32 #ifdef WIN32
unlink (buffer); unlink (buffer);
#endif #endif
if (rename (buffer_tmp, buffer) == 0) if (rename (buffer_tmp, buffer) == 0)
{ {
return 1; return 1;
}
else
{
return 0;
}
} }
else else
{ {
return 0; /* mode = 0, we want to delete but the config file and thus the given setting does not exist, we're ready */
close (fhOut);
return 1;
} }
} }
else /* existing config, preserve settings and find & replace current var value if any */ else /* existing config file, preserve settings and find & replace current var value if any */
{ {
prevConfig = 0; prevSetting = 0;
while (fscanf (fpIn, " %[^\n]", &buffer) != EOF) /* read whole lines including whitespaces */ while (fscanf (fpIn, " %[^\n]", &buffer) != EOF) /* read whole lines including whitespaces */
{ {
@ -1647,12 +1654,20 @@ xchat_set_pluginpref_str_real (xchat_plugin *pl, const char *var, const char *va
if (strncmp (buffer_tmp, buffer, strlen (var) + 1) == 0) /* given setting already exists */ if (strncmp (buffer_tmp, buffer, strlen (var) + 1) == 0) /* given setting already exists */
{ {
sprintf (buffer, "%s = %s\n", var, value); if (mode) /* overwrite the existing matching setting if we are in save mode */
prevConfig = 1; {
sprintf (buffer, "%s = %s\n", var, value);
}
else /* erase the setting in delete mode */
{
strcpy (buffer, "");
}
prevSetting = 1;
} }
else else
{ {
strcat (buffer, "\n"); strcat (buffer, "\n"); /* preserve the existing different settings */
} }
write (fhOut, buffer, strlen (buffer)); write (fhOut, buffer, strlen (buffer));
@ -1660,7 +1675,7 @@ xchat_set_pluginpref_str_real (xchat_plugin *pl, const char *var, const char *va
fclose (fpIn); fclose (fpIn);
if (!prevConfig) /* var doesn't exist currently, append */ if (!prevSetting && mode) /* var doesn't exist currently, append if we're in save mode */
{ {
sprintf (buffer, "%s = %s\n", var, value); sprintf (buffer, "%s = %s\n", var, value);
write (fhOut, buffer, strlen (buffer)); write (fhOut, buffer, strlen (buffer));
@ -1689,7 +1704,7 @@ xchat_set_pluginpref_str_real (xchat_plugin *pl, const char *var, const char *va
int int
xchat_set_pluginpref_str (xchat_plugin *pl, const char *var, const char *value) xchat_set_pluginpref_str (xchat_plugin *pl, const char *var, const char *value)
{ {
return xchat_set_pluginpref_str (pl, var, value, 1); return xchat_set_pluginpref_str_real (pl, var, value, 1);
} }
int int
@ -1771,5 +1786,5 @@ xchat_get_pluginpref_int (xchat_plugin *pl, const char *var)
int int
xchat_del_pluginpref (xchat_plugin *pl, const char *var) xchat_del_pluginpref (xchat_plugin *pl, const char *var)
{ {
xchat_set_pluginpref_str_real (pl, var, 0, 0); return xchat_set_pluginpref_str_real (pl, var, 0, 0);
} }