Menu
▾
▴
[Gaim-commits] CVS: gaim/src blist.c,1.166,1.167 log.c,1.102,1.103 util.c,1.322,1.323 util.h,1.63,1.64
|
From: Nathan W. <fac...@us...> - 2004-09-01 00:49:01
|
Update of /cvsroot/gaim/gaim/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23583/src Modified Files: blist.c log.c util.c util.h Log Message: remove some code duplication, add some code duplication, make these functions accessable to other stuff, and apparently a random whitespace cleanup Index: blist.c =================================================================== RCS file: /cvsroot/gaim/gaim/src/blist.c,v retrieving revision 1.166 retrieving revision 1.167 diff -u -d -p -r1.166 -r1.167 --- blist.c 20 Aug 2004 03:40:33 -0000 1.166 +++ blist.c 1 Sep 2004 00:48:34 -0000 1.167 @@ -655,7 +655,7 @@ gaim_buddy_set_icon(GaimBuddy *buddy, Ga gaim_blist_node_remove_setting((GaimBlistNode *)buddy, "buddy_icon"); schedule_blist_save(); - + gaim_blist_update_buddy_icon(buddy); } Index: log.c =================================================================== RCS file: /cvsroot/gaim/gaim/src/log.c,v retrieving revision 1.102 retrieving revision 1.103 diff -u -d -p -r1.102 -r1.103 --- log.c 31 Aug 2004 18:28:35 -0000 1.102 +++ log.c 1 Sep 2004 00:48:36 -0000 1.103 @@ -178,115 +178,31 @@ int gaim_log_get_total_size(GaimLogType return size; } -#if 0 -static char* unescape_filename(const char *escaped) { - const char *c = escaped; - GString *ret; - - if (escaped == NULL) - return NULL; - - ret = g_string_new(""); - - /** - * <>:"/\ |?*'&$ - * The above chars are "taboo" for gaim log names and are URL escaped - * % is also escaped so we can convert back easily - */ - - while (*c) { - if (*c == '%') { - if (*(c + 1) && *(c + 2)) { - char hex[2]; - hex[0] = *(c + 1); - hex[1] = *(c + 2); - unsigned char *nonhex; - gaim_base16_decode(hex, &nonhex); - ret = g_string_append_c(ret, *nonhex); - g_free(nonhex); - c += 2; - } - } else { - ret = g_string_append_c(ret, *c); - } - c++; - } - - return g_string_free(ret, FALSE); -} -#endif - -static char* escape_filename(const char *unescaped) { - const char *c = unescaped; - char *hex; - GString *ret; - - if (unescaped == NULL) - return NULL; - - ret = g_string_new(""); - - /** - * <>:"/\ |?*'&$ - * The above chars are "taboo" for gaim log names and are URL escaped - * % is also escaped so we can convert back easily - */ - - while (*c) { - switch (*c) { - case '<': - case '>': - case ':': - case '"': - case '/': - case '\\': - case ' ': - case '|': - case '?': - case '*': - case '\'': - case '&': - case '$': - case '%': - hex = g_strdup_printf ("%%%X", (int) *c); - ret = g_string_append(ret, hex); - g_free(hex); - break; - default: - ret = g_string_append_c(ret, *c); - } - c++; - } - - return g_string_free(ret, FALSE); -} - static char* gaim_log_get_log_dir(GaimLogType type, const char *name, GaimAccount *account) { - char *acct_name = escape_filename(gaim_normalize(account, - gaim_account_get_username(account))); - char *target; + char *acct_name = g_strdup(gaim_escape_filename(gaim_normalize(account, + gaim_account_get_username(account)))); + const char *target; /* does this seem like a bad way to get this component of the path to anyone else? --Nathan */ const char *prpl = GAIM_PLUGIN_PROTOCOL_INFO( gaim_find_prpl(gaim_account_get_protocol_id(account)) )->list_icon(account, NULL); - + char *dir; if (type == GAIM_LOG_CHAT) { char *temp = g_strdup_printf("%s.chat", gaim_normalize(account, name)); - target = escape_filename(temp); + target = gaim_escape_filename(temp); g_free(temp); } else if(type == GAIM_LOG_SYSTEM) { - target = g_strdup(".system"); + target = ".system"; } else { - target = escape_filename(gaim_normalize(account, name)); + target = gaim_escape_filename(gaim_normalize(account, name)); } dir = g_build_filename(gaim_user_dir(), "logs", prpl, acct_name, target, NULL); - g_free(target); - g_free(acct_name); + g_free(acct_name); return dir; } Index: util.c =================================================================== RCS file: /cvsroot/gaim/gaim/src/util.c,v retrieving revision 1.322 retrieving revision 1.323 diff -u -d -p -r1.322 -r1.323 --- util.c 30 Aug 2004 23:13:28 -0000 1.322 +++ util.c 1 Sep 2004 00:48:36 -0000 1.323 @@ -3203,3 +3203,34 @@ char *gaim_text_strip_mnemonic(const cha return out; } +const char* gaim_unescape_filename(const char *escaped) { + return gaim_url_decode(escaped); +} + + +/* this is almost identical to gaim_url_encode (hence gaim_url_decode + * being used above), but we want to keep certain characters unescaped + * for compat reasons */ +const char * +gaim_escape_filename(const char *str) +{ + static char buf[BUF_LEN]; + guint i, j = 0; + + g_return_val_if_fail(str != NULL, NULL); + + for (i = 0; i < strlen(str); i++) { + if (isalnum(str[i]) || str[i] == '@') + buf[j++] = str[i]; + else { + sprintf(buf + j, "%%%02x", (unsigned char)str[i]); + j += 3; + } + } + + buf[j] = '\0'; + + return buf; +} + + Index: util.h =================================================================== RCS file: /cvsroot/gaim/gaim/src/util.h,v retrieving revision 1.63 retrieving revision 1.64 diff -u -d -p -r1.63 -r1.64 --- util.h 5 Aug 2004 14:17:03 -0000 1.63 +++ util.h 1 Sep 2004 00:48:38 -0000 1.64 @@ -736,6 +736,26 @@ char *gaim_text_strip_mnemonic(const cha */ #define gaim_add_eight(x) ((x)+8) +/** + * Does the reverse of gaim_escape_filename + * + * This will change hex codes and such to their ascii equivalents. + * + * @param str The string to translate. + * + * @return The resulting string. + */ +const char *gaim_unescape_filename(const char *str); + +/** + * Escapes filesystem-unfriendly characters from a filename + * + * @param str The string to translate. + * + * @return The resulting string. + */ +const char *gaim_escape_filename(const char *str); + #ifdef __cplusplus } #endif |