g_hash_table_foreach(table, hash_free_strings_func, NULL);
}
+static void hash_free_value_mem_func(gpointer key, gpointer value,
+ gpointer data)
+{
+ g_free(value);
+}
+
+void hash_free_value_mem(GHashTable *table)
+{
+ g_hash_table_foreach(table, hash_free_value_mem_func, NULL);
+}
+
void ptr_array_free_strings(GPtrArray *array)
{
gint i;
gchar *to_human_readable(off_t size)
{
- static gchar str[9];
- gint count;
- guint32 div = 1;
+ static gchar str[10];
- for (count = 0; count < 3; count++) {
- if (size / div < 1024)
- break;
- else
- div *= 1024;
- }
-
- switch (count) {
- case 0: g_snprintf(str, sizeof(str), "%dB", (gint)size); break;
- case 1: g_snprintf(str, sizeof(str), "%.1fKB", (gfloat)size / div);
- break;
- case 2: g_snprintf(str, sizeof(str), "%.1fMB", (gfloat)size / div);
- break;
- default:
- g_snprintf(str, sizeof(str), "%.1fGB", (gfloat)size / div);
- break;
- }
+ if (size < 1024)
+ g_snprintf(str, sizeof(str), "%dB", (gint)size);
+ else if (size >> 10 < 1024)
+ g_snprintf(str, sizeof(str), "%.1fKB", (gfloat)size / (1 << 10));
+ else if (size >> 20 < 1024)
+ g_snprintf(str, sizeof(str), "%.2fMB", (gfloat)size / (1 << 20));
+ else
+ g_snprintf(str, sizeof(str), "%.2fGB", (gfloat)size / (1 << 30));
return str;
}
else
return strcmp(s1, s2);
}
-
+/* strstr with NULL-checking */
+gchar *strstr2(const gchar *s1, const gchar *s2)
+{
+ if (s1 == NULL || s2 == NULL)
+ return NULL;
+ else
+ return strstr(s1, s2);
+}
/* compare paths */
gint path_cmp(const gchar *s1, const gchar *s2)
{
{
gint mbl;
const wchar_t *wp;
- gchar tmp[MB_CUR_MAX];
+ gchar tmp[MB_LEN_MAX];
/* skip head space */
for (wp = s; *wp != (wchar_t)0 && iswspace(*wp); wp++)
/* compare subjects */
gint subject_compare(const gchar *s1, const gchar *s2)
{
- gint retval;
gchar *str1, *str2;
if (!s1 || !s2) return -1;
if (!*str1 || !*str2) return -1;
- retval = strcmp(str1, str2);
- /*
- if (retval == 0)
- g_print("\ns1 = %s\ns2 = %s\n"
- "str1 = %s\nstr2 = %s\nmatched.\n",
- s1, s2, str1, str2);
- */
- return retval;
+ return strcmp(str1, str2);
}
void trim_subject(gchar *str)
gint get_quote_level(const gchar *str)
{
- size_t firstquotepos;
- size_t lastquotepos = -1;
+ const gchar *first_pos;
+ const gchar *last_pos;
const gchar *p = str;
- const gchar *pos;
- gint quotelevel = -1;
- gint i = 0;
+ gint quote_level = -1;
/* speed up line processing by only searching to the last '>' */
- if ((pos = strchr(str, '>')) != NULL) {
- firstquotepos = pos - str;
- lastquotepos = strrchr(str, '>') - str + 1;
-
+ if ((first_pos = strchr(str, '>')) != NULL) {
/* skip a line if it contains a '<' before the initial '>' */
- if (memchr(str, '<', pos - str) != NULL)
+ if (memchr(str, '<', first_pos - str) != NULL)
return -1;
+ last_pos = strrchr(first_pos, '>');
} else
return -1;
- while (i < lastquotepos) {
- while (i < lastquotepos) {
- if (isspace(*p) || (*p == '\t')) {
+ while (p <= last_pos) {
+ while (p < last_pos) {
+ if (isspace(*p))
p++;
- i++;
- } else
+ else
break;
}
- if (i >= lastquotepos)
- break;
if (*p == '>')
- quotelevel++;
- else if ((*p != '-') && !isspace(*p) && (i < lastquotepos)) {
+ quote_level++;
+ else if (*p != '-' && !isspace(*p) && p <= last_pos) {
/* any characters are allowed except '-' and space */
- while ((*p != '-') && (*p != '>') && !isspace(*p) &&
- (i < lastquotepos)) {
+ while (*p != '-' && *p != '>' && !isspace(*p) &&
+ p < last_pos)
p++;
- i++;
- }
if (*p == '>')
- quotelevel++;
- else if ((i >= lastquotepos) || isspace(*p))
+ quote_level++;
+ else
break;
}
p++;
- i++;
}
- return quotelevel;
+ return quote_level;
}
GList *uri_list_extract_filenames(const gchar *uri_list)
struct dirent *d;
gchar *prev_dir;
- /*g_print("dir = %s\n", dir);*/
+ /* g_print("dir = %s\n", dir); */
if (stat(dir, &s) < 0) {
FILE_OP_ERROR(dir, "stat");
}
prev_dir = g_get_current_dir();
- /*g_print("prev_dir = %s\n", prev_dir);*/
+ /* g_print("prev_dir = %s\n", prev_dir); */
if (!path_cmp(prev_dir, dir)) {
g_free(prev_dir);
continue;
}
- /*g_print("removing %s\n", d->d_name);*/
+ /* g_print("removing %s\n", d->d_name); */
if (S_ISDIR(s.st_mode)) {
if (remove_dir_recursive(d->d_name) < 0) {
return 0;
}
-gint execute_command_line(const gchar *cmdline)
+gint execute_sync(gchar *const argv[])
+{
+ pid_t pid;
+
+ if ((pid = fork()) < 0) {
+ perror("fork");
+ return -1;
+ }
+
+ if (pid == 0) { /* child process */
+ execvp(argv[0], argv);
+
+ perror("execvp");
+ _exit(1);
+ }
+
+ waitpid(pid, NULL, 0);
+
+ return 0;
+}
+
+gint execute_command_line(const gchar *cmdline, gboolean async)
{
gchar **argv;
gint i;
}
}
- ret = execute_async(argv);
+ if (async)
+ ret = execute_async(argv);
+ else
+ ret = execute_sync(argv);
g_strfreev(argv);
return ret;
}
+static gint is_unchanged_uri_char(char c)
+{
+ switch (c) {
+ case '(':
+ case ')':
+ case ',':
+ return 0;
+ default:
+ return 1;
+ }
+}
+
+void encode_uri(gchar * encoded_uri, gint bufsize, const gchar * uri)
+{
+ int i;
+ int k;
+
+ k = 0;
+ for(i = 0; i < strlen(uri) ; i++) {
+ if (is_unchanged_uri_char(uri[i])) {
+ if (k + 2 >= bufsize)
+ break;
+ encoded_uri[k++] = uri[i];
+ }
+ else {
+ char * hexa = "0123456789ABCDEF";
+
+ if (k + 4 >= bufsize)
+ break;
+ encoded_uri[k++] = '%';
+ encoded_uri[k++] = hexa[uri[i] / 16];
+ encoded_uri[k++] = hexa[uri[i] % 16];
+ }
+ }
+ encoded_uri[k] = 0;
+}
+
+/* Converts two-digit hexadecimal to decimal. Used for unescaping escaped
+ * characters
+ */
+static gint axtoi(const gchar *hexstr)
+{
+ gint Hi, Lo, Result;
+
+ Hi = hexstr[0];
+ if ('0' <= Hi && Hi <= '9') {
+ Hi -= '0';
+ } else
+ if ('a' <= Hi && Hi <= 'f') {
+ Hi -=('a'-10);
+ } else
+ if ('A' <= Hi && Hi <= 'F') {
+ Hi -= ('A'-10);
+ }
+
+ Lo = hexstr[1];
+ if ('0' <= Lo && Lo <='9') {
+ Lo -= '0';
+ } else
+ if ('a' <= Lo && Lo <= 'f') {
+ Lo -= ('a'-10);
+ } else
+ if ('A' <= Lo && Lo <= 'F') {
+ Lo -= ('A'-10);
+ }
+ Result = Lo + (16 * Hi);
+ return (Result);
+}
+
+
+/* Decodes URL-Encoded strings (i.e. strings in which spaces are replaced by
+ * plusses, and escape characters are used)
+ */
+
+void decode_uri(gchar * decoded_uri, const gchar * encoded_uri)
+{
+ const gchar * encoded;
+ gchar * decoded;
+
+ // strcpy(decoded_uri, encoded_uri);
+ // subst_char(decoded_uri, '+', ' ');
+
+ encoded = encoded_uri;
+ decoded = decoded_uri;
+
+ while (* encoded) {
+ if (* encoded == '%') {
+ encoded ++;
+ if (isxdigit(encoded[0])
+ && isxdigit(encoded[1])) {
+ * decoded = (gchar) axtoi(encoded);
+ decoded ++;
+ encoded += 2;
+ }
+ }
+ else if (* encoded == '+') {
+ * decoded = ' ';
+ decoded ++;
+ encoded ++;
+ }
+ else {
+ * decoded = * encoded;
+ decoded ++;
+ encoded ++;
+ }
+ }
+
+ * decoded = '\0';
+}
+
+
gint open_uri(const gchar *uri, const gchar *cmdline)
{
static gchar *default_cmdline = "netscape -remote openURL(%s,raise)";
gchar buf[BUFFSIZE];
gchar *p;
-
+ gchar encoded_uri[BUFFSIZE];
+
g_return_val_if_fail(uri != NULL, -1);
+ /* an option to choose whether to use encode_uri or not ? */
+ encode_uri(encoded_uri, BUFFSIZE, uri);
+
if (cmdline &&
(p = strchr(cmdline, '%')) && *(p + 1) == 's' &&
!strchr(p + 2, '%'))
- g_snprintf(buf, sizeof(buf), cmdline, uri);
+ g_snprintf(buf, sizeof(buf), cmdline, encoded_uri);
else {
if (cmdline)
g_warning(_("Open URI command line is invalid: `%s'"),
cmdline);
- g_snprintf(buf, sizeof(buf), default_cmdline, uri);
+ g_snprintf(buf, sizeof(buf), default_cmdline, encoded_uri);
}
-
- execute_command_line(buf);
+
+ execute_command_line(buf, TRUE);
return 0;
}
}
}
-void debug_print(const gchar *format, ...)
+static guint log_verbosity_count = 0;
+
+void log_verbosity_set(gboolean verbose)
+{
+ if (verbose)
+ log_verbosity_count++;
+ else if (log_verbosity_count > 0)
+ log_verbosity_count--;
+}
+
+void debug_print_real(const gchar *format, ...)
{
va_list args;
gchar buf[BUFFSIZE];
{
va_list args;
gchar buf[BUFFSIZE];
+ gchar *logbuf;
+ gchar timestr[6];
+ time_t t;
va_start(args, format);
g_vsnprintf(buf, sizeof(buf), format, args);
va_end(args);
+
+ time(&t);
+ strftime(timestr, 6, "%H:%M", localtime(&t));
+ logbuf = g_strdup_printf("[%s] %s", timestr, buf);
- if (debug_mode) fputs(buf, stdout);
- log_window_append(buf, LOG_NORMAL);
+ if (debug_mode) fputs(logbuf, stdout);
+ log_window_append(logbuf, LOG_NORMAL);
if (log_fp) {
- fputs(buf, log_fp);
+ fputs(logbuf, log_fp);
fflush(log_fp);
}
- statusbar_puts_all(buf);
+ if (log_verbosity_count)
+ statusbar_puts_all(buf);
+ g_free(logbuf);
}
void log_message(const gchar *format, ...)
fputs(buf, log_fp);
fflush(log_fp);
}
+ statusbar_puts_all(buf);
}
void log_warning(const gchar *format, ...)
g_warning("%s", buf);
log_window_append(buf, LOG_ERROR);
+ if (log_fp) {
+ fputs("*** error: ", log_fp);
+ fputs(buf, log_fp);
+ fflush(log_fp);
+ }
}
projects / claws.git / blobdiff