/*
* Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2007 Hiroyuki Yamamoto & The Claws Mail Team
+ * Copyright (C) 1999-2009 Hiroyuki Yamamoto & The Claws Mail Team
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
return chmod(path, mode);
#endif
}
+
+FILE* g_fopen(const gchar *filename, const gchar *mode)
+{
+#ifdef G_OS_WIN32
+ char *name = g_win32_locale_filename_from_utf8(filename);
+ FILE* fp = fopen(name, mode);
+ g_free(name);
+ return fp;
+#else
+ return fopen(filename, mode);
+#endif
+}
+int g_open(const gchar *filename, int flags, int mode)
+{
+#ifdef G_OS_WIN32
+ char *name = g_win32_locale_filename_from_utf8(filename);
+ int fd = open(name, flags, mode);
+ g_free(name);
+ return fp;
+#else
+ return open(filename, flags, mode);
+#endif
+}
#endif /* GLIB_CHECK_VERSION && G_OS_UNIX */
int tmpfd;
*name_used = g_strdup_printf("%s.%ld",_mktemp(template),count++);
- tmpfd = open (*name_used, (O_CREAT | O_RDWR | O_BINARY),
+ tmpfd = g_open (*name_used, (O_CREAT | O_RDWR | O_BINARY),
(S_IRUSR | S_IWUSR));
tempfiles=g_slist_append(tempfiles, g_strdup(*name_used));
gint i;
gchar *str;
- g_return_if_fail(array != NULL);
+ cm_return_if_fail(array != NULL);
for (i = 0; i < array->len; i++) {
str = g_ptr_array_index(array, i);
d = (d*100) >> divisor; \
}
+
+/*!
+ * \brief Convert a given size in bytes in a human-readable string
+ *
+ * \param size The size expressed in bytes to convert in string
+ * \return The string that respresents the size in an human-readable way
+ */
gchar *to_human_readable(goffset size)
{
static gchar str[14];
if (file == NULL)
goto freeout;
- fp = fopen(file, "rb");
+ fp = g_fopen(file, "rb");
if (!fp)
goto freeout;
- outfp = fopen(out, "wb");
+ outfp = g_fopen(out, "wb");
if (!outfp) {
fclose(fp);
goto freeout;
goto unlinkout;
}
- if (rename_force(out, file) < 0)
+ if (move_file(out, file, TRUE) < 0)
goto unlinkout;
g_free(out);
{
GList *old;
- g_return_val_if_fail(str != NULL, list);
+ cm_return_val_if_fail(str != NULL, list);
old = g_list_find_custom(list, (gpointer)str, (GCompareFunc)strcmp2);
if (old) {
gchar **str_array, *s, *new_str;
guint i, n = 1, len;
- g_return_val_if_fail(str != NULL, NULL);
- g_return_val_if_fail(delim != NULL, NULL);
+ cm_return_val_if_fail(str != NULL, NULL);
+ cm_return_val_if_fail(delim != NULL, NULL);
if (max_tokens < 1)
max_tokens = G_MAXINT;
const gchar *p = group;
const gchar *last;
- g_return_val_if_fail(group != NULL, NULL);
+ cm_return_val_if_fail(group != NULL, NULL);
last = group + strlen(group);
abbrev_group = ap = g_malloc(strlen(group) + 1);
* g_filename_from_uri() rejects escaped/locale encoded uri
* string which come from Nautilus.
*/
+#ifndef G_OS_WIN32
if (g_utf8_validate(file, -1, NULL))
locale_file
= conv_codeset_strdup(
conv_get_locale_charset_str());
if (!locale_file)
locale_file = g_strdup(file + 5);
+#else
+ locale_file = g_filename_from_uri(file, NULL, NULL);
+#endif
result = g_list_append(result, locale_file);
}
}
*body = decode_uri_gdup(value);
} else if (body && !*body && !g_ascii_strcasecmp(field, "insert")) {
gchar *tmp = decode_uri_gdup(value);
+<<<<<<< utils.c
if (!g_file_get_contents(value, body, NULL, NULL)) {
- g_error("Error: couldn't set insert file '%s' in body\n", value);
+ g_warning("Error: couldn't set insert file '%s' in body\n", value);
+=======
+ if (!g_file_get_contents(tmp, body, NULL, NULL)) {
+ g_warning("Error: couldn't set insert file '%s' in body\n", value);
+>>>>>>> 1.36.2.176
}
g_free(tmp);
tmp = NULL;
if (tmp) {
/* attach is correct */
num_attach++;
- printf("realloc my_att %d\n", (num_attach+1));
my_att = g_realloc(my_att, (sizeof(char *))*(num_attach+1));
my_att[num_attach-1] = tmp;
my_att[num_attach] = NULL;
handle = dlopen (dllnames[i], RTLD_LAZY);
if (handle)
{
- func = dlsym (handle, "SHGetFolderPathA");
+ func = dlsym (handle, "SHGetFolderPathW");
if (!func)
{
dlclose (handle);
const gchar *get_home_dir(void)
{
#ifdef G_OS_WIN32
- static char home_dir[MAX_PATH] = "";
-
- if (home_dir[0] == '\0') {
+ static char home_dir_utf16[MAX_PATH] = "";
+ static gchar *home_dir_utf8 = NULL;
+ if (home_dir_utf16[0] == '\0') {
if (w32_shgetfolderpath
(NULL, CSIDL_APPDATA|CSIDL_FLAG_CREATE,
- NULL, 0, home_dir) < 0)
- strcpy (home_dir, "C:\\Sylpheed");
+ NULL, 0, home_dir_utf16) < 0)
+ strcpy (home_dir_utf16, "C:\\Sylpheed");
+ home_dir_utf8 = g_utf16_to_utf8 ((const gunichar *)home_dir_utf16, -1, NULL, NULL, NULL);
}
- return home_dir;
+ return home_dir_utf8;
#else
static const gchar *homeenv = NULL;
const gchar *get_mail_base_dir(void)
{
-#ifdef G_OS_WIN32
- static gchar *mail_base_dir = NULL;
-
- if (!mail_base_dir)
- mail_base_dir = g_strconcat(get_rc_dir(), G_DIR_SEPARATOR_S,
- "Mailboxes", NULL);
-
- return mail_base_dir;
-#else
return get_home_dir();
-#endif
}
#ifdef MAEMO
return template_dir;
}
+#ifdef G_OS_WIN32
+const gchar *get_cert_file(void)
+{
+ const gchar *cert_file = NULL;
+ if (!cert_file)
+ cert_file = g_strconcat(w32_get_module_dir(),
+ "\\share\\claws-mail\\",
+ "ca-certificates.crt",
+ NULL);
+ return cert_file;
+}
+#endif
+
/* Return the default directory for Plugins. */
const gchar *get_plugin_dir(void)
{
#endif
}
+
+#ifdef G_OS_WIN32
+/* Return the default directory for Themes. */
+const gchar *get_themes_dir(void)
+{
+ static gchar *themes_dir = NULL;
+
+ if (!themes_dir)
+ themes_dir = g_strconcat(w32_get_module_dir(),
+ "\\share\\claws-mail\\themes",
+ NULL);
+ return themes_dir;
+}
+#endif
+
const gchar *get_tmp_dir(void)
{
static gchar *tmp_dir = NULL;
gchar buf[BUFFSIZE];
if ((fp = g_fopen(file, "rb")) == NULL) {
- FILE_OP_ERROR(file, "fopen");
+ FILE_OP_ERROR(file, "g_fopen");
return -1;
}
gboolean err = FALSE;
if ((src_fp = g_fopen(src, "rb")) == NULL) {
- FILE_OP_ERROR(src, "fopen");
+ FILE_OP_ERROR(src, "g_fopen");
return -1;
}
if ((dest_fp = g_fopen(dest, "ab")) == NULL) {
- FILE_OP_ERROR(dest, "fopen");
+ FILE_OP_ERROR(dest, "g_fopen");
fclose(src_fp);
return -1;
}
gboolean err = FALSE;
if ((src_fp = g_fopen(src, "rb")) == NULL) {
- FILE_OP_ERROR(src, "fopen");
+ FILE_OP_ERROR(src, "g_fopen");
return -1;
}
if (is_file_exist(dest)) {
}
if ((dest_fp = g_fopen(dest, "wb")) == NULL) {
- FILE_OP_ERROR(dest, "fopen");
+ FILE_OP_ERROR(dest, "g_fopen");
fclose(src_fp);
if (dest_bak) {
if (rename_force(dest_bak, dest) < 0)
gboolean err = FALSE;
if ((dest_fp = g_fopen(dest, "wb")) == NULL) {
- FILE_OP_ERROR(dest, "fopen");
+ FILE_OP_ERROR(dest, "g_fopen");
return -1;
}
gboolean err = FALSE;
gboolean last_linebreak = FALSE;
+ if (src == NULL || dest == NULL)
+ return -1;
+
if ((src_fp = g_fopen(src, "rb")) == NULL) {
- FILE_OP_ERROR(src, "fopen");
+ FILE_OP_ERROR(src, "g_fopen");
return -1;
}
if ((dest_fp = g_fopen(dest, "wb")) == NULL) {
- FILE_OP_ERROR(dest, "fopen");
+ FILE_OP_ERROR(dest, "g_fopen");
fclose(src_fp);
return -1;
}
FILE *fp;
size_t len;
- g_return_val_if_fail(str != NULL, NULL);
+ cm_return_val_if_fail(str != NULL, NULL);
fp = my_tmpfile();
if (!fp) {
FILE *fp;
size_t len;
- g_return_val_if_fail(str != NULL, -1);
- g_return_val_if_fail(file != NULL, -1);
+ cm_return_val_if_fail(str != NULL, -1);
+ cm_return_val_if_fail(file != NULL, -1);
if ((fp = g_fopen(file, "wb")) == NULL) {
- FILE_OP_ERROR(file, "fopen");
+ FILE_OP_ERROR(file, "g_fopen");
return -1;
}
gint n_read;
gchar *str;
- g_return_val_if_fail(fp != NULL, NULL);
+ cm_return_val_if_fail(fp != NULL, NULL);
array = g_byte_array_new();
int fflags = 0;
#endif
- g_return_val_if_fail(file != NULL, NULL);
+ cm_return_val_if_fail(file != NULL, NULL);
if (g_stat(file, &s) != 0) {
FILE_OP_ERROR(file, "stat");
}
#ifdef G_OS_WIN32
- fp = fopen (file, "rb");
+ fp = g_fopen (file, "rb");
if (fp == NULL) {
FILE_OP_ERROR(file, "open");
return NULL;
}
#else
- fd = open(file, O_RDONLY | O_NONBLOCK);
/* test whether the file is readable without blocking */
- fd = open(file, O_RDONLY | O_NONBLOCK);
+ fd = g_open(file, O_RDONLY | O_NONBLOCK, 0);
if (fd == -1) {
FILE_OP_ERROR(file, "open");
return NULL;
static gint execute_async(gchar *const argv[])
{
- g_return_val_if_fail(argv != NULL && argv[0] != NULL, -1);
+ cm_return_val_if_fail(argv != NULL && argv[0] != NULL, -1);
if (g_spawn_async(NULL, (gchar **)argv, NULL, G_SPAWN_SEARCH_PATH,
NULL, NULL, NULL, FALSE) == FALSE) {
{
gint status;
- g_return_val_if_fail(argv != NULL && argv[0] != NULL, -1);
+ cm_return_val_if_fail(argv != NULL && argv[0] != NULL, -1);
+#ifdef G_OS_UNIX
if (g_spawn_sync(NULL, (gchar **)argv, NULL, G_SPAWN_SEARCH_PATH,
NULL, NULL, NULL, NULL, &status, NULL) == FALSE) {
g_warning("Couldn't execute command: %s\n", argv[0]);
return -1;
}
-#ifdef G_OS_UNIX
if (WIFEXITED(status))
return WEXITSTATUS(status);
else
return -1;
#else
+ if (g_spawn_sync(NULL, (gchar **)argv, NULL, G_SPAWN_SEARCH_PATH|
+ G_SPAWN_CHILD_INHERITS_STDIN|G_SPAWN_LEAVE_DESCRIPTORS_OPEN,
+ NULL, NULL, NULL, NULL, &status, NULL) == FALSE) {
+ g_warning("Couldn't execute command: %s\n", argv[0]);
+ return -1;
+ }
+
return status;
#endif
}
gchar *child_stdout;
gint status;
- g_return_val_if_fail(cmdline != NULL, NULL);
+ cm_return_val_if_fail(cmdline != NULL, NULL);
debug_print("get_command_output(): executing: %s\n", cmdline);
gint open_uri(const gchar *uri, const gchar *cmdline)
{
#ifndef MAEMO
+#ifndef G_OS_WIN32
gchar buf[BUFFSIZE];
gchar *p;
gchar encoded_uri[BUFFSIZE];
- g_return_val_if_fail(uri != NULL, -1);
+ cm_return_val_if_fail(uri != NULL, -1);
/* an option to choose whether to use encode_uri or not ? */
encode_uri(encoded_uri, BUFFSIZE, uri);
g_snprintf(buf, sizeof(buf), cmdline, encoded_uri);
else {
if (cmdline)
- g_warning("Open URI command line is invalid "
+ g_warning("Open URI command-line is invalid "
"(there must be only one '%%s'): %s",
cmdline);
g_snprintf(buf, sizeof(buf), DEFAULT_BROWSER_CMD, encoded_uri);
}
execute_command_line(buf, TRUE);
+#else
+ ShellExecute(NULL, "open", uri, NULL, NULL, SW_SHOW);
+#endif
#else
extern osso_context_t *get_osso_context(void);
osso_rpc_run_with_defaults(get_osso_context(), "osso_browser",
gchar buf[BUFFSIZE];
gchar *p;
- g_return_val_if_fail(filepath != NULL, -1);
+ cm_return_val_if_fail(filepath != NULL, -1);
if (cmdline &&
(p = strchr(cmdline, '%')) && *(p + 1) == 's' &&
g_snprintf(buf, sizeof(buf), cmdline, filepath);
else {
if (cmdline)
- g_warning("Open Text Editor command line is invalid "
+ g_warning("Open Text Editor command-line is invalid "
"(there must be only one '%%s'): %s",
cmdline);
g_snprintf(buf, sizeof(buf), DEFAULT_EDITOR_CMD, filepath);
#ifndef G_OS_WIN32
struct tm buf1, buf2;
#endif
-
+#ifdef G_OS_WIN32
+ if (now && *now < 0)
+ return 0;
+#endif
gmt = *gmtime_r(now, &buf1);
lt = localtime_r(now, &buf2);
#ifndef G_OS_WIN32
struct tm buf1, buf2;
#endif
-
+#ifdef G_OS_WIN32
+ if (now && *now < 0)
+ return 0;
+#endif
gmt = *gmtime_r(now, &buf1);
lt = localtime_r(now, &buf2);
g_hash_table_remove(subject_table, subject);
}
-/*!
- *\brief Check if a string is prefixed with known (combinations)
- * of prefixes. The function assumes that each prefix
- * is terminated by zero or exactly _one_ space.
- *
- *\param str String to check for a prefixes
- *
- *\return int Number of chars in the prefix that should be skipped
- * for a "clean" subject line. If no prefix was found, 0
- * is returned.
- */
+#ifndef G_OS_WIN32
static regex_t u_regex;
static gboolean u_init_;
+#endif
void utils_free_regex(void)
{
+#ifndef G_OS_WIN32
if (u_init_) {
regfree(&u_regex);
u_init_ = FALSE;
}
+#endif
}
+/*!
+ *\brief Check if a string is prefixed with known (combinations)
+ * of prefixes. The function assumes that each prefix
+ * is terminated by zero or exactly _one_ space.
+ *
+ *\param str String to check for a prefixes
+ *
+ *\return int Number of chars in the prefix that should be skipped
+ * for a "clean" subject line. If no prefix was found, 0
+ * is returned.
+ */
int subject_get_prefix_length(const gchar *subject)
{
+#ifndef G_OS_WIN32
/*!< Array with allowable reply prefixes regexps. */
static const gchar * const prefixes[] = {
"Re\\:", /* "Re:" */
"Antw\\:", /* "Antw:" (Dutch / German Outlook) */
"Aw\\:", /* "Aw:" (German) */
"Antwort\\:", /* "Antwort:" (German Lotus Notes) */
- "Res\\:", /* "Res:" (Brazilian Outlook) */
+ "Res\\:", /* "Res:" (Spanish/Brazilian Outlook) */
"Fw\\:", /* "Fw:" Forward */
"Fwd\\:", /* "Fwd:" Forward */
"Enc\\:", /* "Enc:" Forward (Brazilian Outlook) */
"Sv\\:", /* "Sv" (Norwegian) */
"Vs\\:", /* "Vs" (Norwegian) */
"Ad\\:", /* "Ad" (Norwegian) */
- "\347\255\224\345\244\215\\:" /* "Re" (Chinese, UTF-8) */
+ "\347\255\224\345\244\215\\:", /* "Re" (Chinese, UTF-8) */
+ "R\303\251f\\. \\:", /* "Réf. :" (French Lotus Notes) */
+ "Re \\:", /* "Re :" (French Yahoo Mail) */
/* add more */
};
const int PREFIXES = sizeof prefixes / sizeof prefixes[0];
return pos.rm_eo;
else
return 0;
-}
+#else
+ /*!< Array with allowable reply prefixes regexps. */
+ static const gchar * const prefixes[] = {
+ "re:", /* "Re:" */
+ "antw:", /* "Antw:" (Dutch / German Outlook) */
+ "aw:", /* "Aw:" (German) */
+ "antwort:", /* "Antwort:" (German Lotus Notes) */
+ "res:", /* "Res:" (Spanish/Brazilian Outlook) */
+ "fw:", /* "Fw:" Forward */
+ "fwd:", /* "Fwd:" Forward */
+ "enc:", /* "Enc:" Forward (Brazilian Outlook) */
+ "odp:", /* "Odp:" Re (Polish Outlook) */
+ "rif:", /* "Rif:" (Italian Outlook) */
+ "sv:", /* "Sv" (Norwegian) */
+ "vs:", /* "Vs" (Norwegian) */
+ "ad:", /* "Ad" (Norwegian) */
+ "R\303\251f. :", /* "Réf. :" (French Lotus Notes) */
+ "Re :", /* "Re :" (French Yahoo Mail) */
+ /* add more */
+ };
+ const int PREFIXES = sizeof prefixes / sizeof prefixes[0];
+ int n;
+
+ if (!subject) return 0;
+ if (!*subject) return 0;
+ for (n = 0; n < PREFIXES; n++) {
+ int len = strlen(prefixes[n]);
+ if (!strncasecmp(subject, prefixes[n], len)) {
+ if (subject[len] == ' ')
+ return len+1;
+ else
+ return len;
+ }
+ }
+ return 0;
+#endif
+}
static guint g_stricase_hash(gconstpointer gptr)
{
guint hash_result = 0;
return GPOINTER_TO_INT(a) - GPOINTER_TO_INT(b);
}
-gchar *generate_msgid(gchar *buf, gint len)
+gchar *generate_msgid(gchar *buf, gint len, gchar *user_addr)
{
struct tm *lt;
time_t t;
lt = localtime_r(&t, &buft);
if (strcmp(buf, "") == 0) {
- addr = g_strconcat("@", get_domain_name(), NULL);
+ if (user_addr != NULL) {
+ addr = g_strconcat(user_addr, "@", get_domain_name(), NULL);
+ }
+ else {
+ addr = g_strconcat("@", get_domain_name(), NULL);
+ }
}
else {
- addr = g_strconcat("@", buf, NULL);
+ if (user_addr != NULL) {
+ addr = g_strconcat(user_addr, "@", buf, NULL);
+ }
+ else {
+ addr = g_strconcat("@", buf, NULL);
+ }
}
g_snprintf(buf, len, "%04d%02d%02d%02d%02d%02d.%08x%s",
GNode *root;
GNodeMapData mapdata;
- g_return_val_if_fail(node != NULL, NULL);
- g_return_val_if_fail(func != NULL, NULL);
+ cm_return_val_if_fail(node != NULL, NULL);
+ cm_return_val_if_fail(func != NULL, NULL);
root = g_node_new(func(node->data, data));
const gchar *ep_;
gint parenthese_cnt = 0;
- g_return_val_if_fail(start != NULL, FALSE);
- g_return_val_if_fail(scanpos != NULL, FALSE);
- g_return_val_if_fail(bp != NULL, FALSE);
- g_return_val_if_fail(ep != NULL, FALSE);
+ cm_return_val_if_fail(start != NULL, FALSE);
+ cm_return_val_if_fail(scanpos != NULL, FALSE);
+ cm_return_val_if_fail(bp != NULL, FALSE);
+ cm_return_val_if_fail(ep != NULL, FALSE);
*bp = scanpos;
gint n;
GHashTable *htab = g_hash_table_new(g_stricase_hash, g_stricase_equal);
- g_return_val_if_fail(htab, NULL);
+ cm_return_val_if_fail(htab, NULL);
for (n = 0; n < sizeof toplvl_domains / sizeof toplvl_domains[0]; n++)
g_hash_table_insert(htab, (gpointer) toplvl_domains[n], (gpointer) toplvl_domains[n]);
return htab;
gchar closure_stack[128];
gchar *ptr = closure_stack;
- g_return_val_if_fail(start != NULL, FALSE);
- g_return_val_if_fail(scanpos != NULL, FALSE);
- g_return_val_if_fail(bp != NULL, FALSE);
- g_return_val_if_fail(ep != NULL, FALSE);
+ cm_return_val_if_fail(start != NULL, FALSE);
+ cm_return_val_if_fail(scanpos != NULL, FALSE);
+ cm_return_val_if_fail(bp != NULL, FALSE);
+ cm_return_val_if_fail(ep != NULL, FALSE);
if (hdr) {
const gchar *start_quote = NULL;
if (!dom_tab)
dom_tab = create_domain_tab();
- g_return_val_if_fail(dom_tab, FALSE);
+ cm_return_val_if_fail(dom_tab, FALSE);
/* scan start of address */
for (bp_ = scanpos - 1;
POP_STACK();
continue;
}
- if (*bp_ == '\'' || *bp_ == '"') {
+ if (!IN_STACK() && (*bp_ == '\'' || *bp_ == '"')) {
PUSH_STACK(*bp_);
continue;
}
static gchar *mailcap_get_command_in_file(const gchar *path, const gchar *type, const gchar *file_to_open)
{
- FILE *fp = fopen(path, "rb");
+ FILE *fp = g_fopen(path, "rb");
gchar buf[BUFFSIZE];
gchar *result = NULL;
if (!fp)
gchar *path = NULL, *outpath = NULL;
path = g_strconcat(get_home_dir(), G_DIR_SEPARATOR_S, ".mailcap", NULL);
outpath = g_strconcat(get_home_dir(), G_DIR_SEPARATOR_S, ".mailcap.new", NULL);
- FILE *fp = fopen(path, "rb");
- FILE *outfp = fopen(outpath, "wb");
+ FILE *fp = g_fopen(path, "rb");
+ FILE *outfp = g_fopen(outpath, "wb");
gchar buf[BUFFSIZE];
gboolean err = FALSE;
const gchar *s_daynames[] = {NULL, NULL, NULL, NULL, NULL, NULL, NULL};
const gchar *s_monthnames[] = {NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL};
+
+gint daynames_len[] = {0,0,0,0,0,0,0};
+gint monthnames_len[] = {0,0,0,0,0,0,
+ 0,0,0,0,0,0};
+gint s_daynames_len[] = {0,0,0,0,0,0,0};
+gint s_monthnames_len[] = {0,0,0,0,0,0,
+ 0,0,0,0,0,0};
const gchar *s_am_up = NULL;
const gchar *s_pm_up = NULL;
const gchar *s_am_low = NULL;
const gchar *s_pm_low = NULL;
+
+gint s_am_up_len = 0;
+gint s_pm_up_len = 0;
+gint s_am_low_len = 0;
+gint s_pm_low_len = 0;
+
const gchar *def_loc_format = NULL;
const gchar *date_loc_format = NULL;
const gchar *time_loc_format = NULL;
static void init_time_names(void)
{
+ int i = 0;
+
daynames[0] = Q_("Complete day name for use by strftime|Sunday");
daynames[1] = Q_("Complete day name for use by strftime|Monday");
daynames[2] = Q_("Complete day name for use by strftime|Tuesday");
daynames[4] = Q_("Complete day name for use by strftime|Thursday");
daynames[5] = Q_("Complete day name for use by strftime|Friday");
daynames[6] = Q_("Complete day name for use by strftime|Saturday");
-
+
monthnames[0] = Q_("Complete month name for use by strftime|January");
monthnames[1] = Q_("Complete month name for use by strftime|February");
monthnames[2] = Q_("Complete month name for use by strftime|March");
s_monthnames[10] = Q_("Abbr. month name for use by strftime|Nov");
s_monthnames[11] = Q_("Abbr. month name for use by strftime|Dec");
+ for (i = 0; i < 7; i++) {
+ daynames_len[i] = strlen(daynames[i]);
+ s_daynames_len[i] = strlen(s_daynames[i]);
+ }
+ for (i = 0; i < 12; i++) {
+ monthnames_len[i] = strlen(monthnames[i]);
+ s_monthnames_len[i] = strlen(s_monthnames[i]);
+ }
+
s_am_up = Q_("For use by strftime (morning)|AM");
s_pm_up = Q_("For use by strftime (afternoon)|PM");
s_am_low = Q_("For use by strftime (morning, lowercase)|am");
s_pm_low = Q_("For use by strftime (afternoon, lowercase)|pm");
+ s_am_up_len = strlen(s_am_up);
+ s_pm_up_len = strlen(s_pm_up);
+ s_am_low_len = strlen(s_am_low);
+ s_pm_low_len = strlen(s_pm_low);
+
def_loc_format = Q_("For use by strftime (default date+time format)|%a %b %e %H:%M:%S %Y");
date_loc_format = Q_("For use by strftime (default date format)|%m/%d/%y");
time_loc_format = Q_("For use by strftime (default time format)|%H:%M:%S");
*curpos = '%';
break;
case 'a':
- len = strlen(s_daynames[lt->tm_wday]); CHECK_SIZE();
+ len = s_daynames_len[lt->tm_wday]; CHECK_SIZE();
strncpy2(curpos, s_daynames[lt->tm_wday], buflen - total_done);
break;
case 'A':
- len = strlen(daynames[lt->tm_wday]); CHECK_SIZE();
+ len = daynames_len[lt->tm_wday]; CHECK_SIZE();
strncpy2(curpos, daynames[lt->tm_wday], buflen - total_done);
break;
case 'b':
case 'h':
- len = strlen(s_monthnames[lt->tm_mon]); CHECK_SIZE();
+ len = s_monthnames_len[lt->tm_mon]; CHECK_SIZE();
strncpy2(curpos, s_monthnames[lt->tm_mon], buflen - total_done);
break;
case 'B':
- len = strlen(monthnames[lt->tm_mon]); CHECK_SIZE();
+ len = monthnames_len[lt->tm_mon]; CHECK_SIZE();
strncpy2(curpos, monthnames[lt->tm_mon], buflen - total_done);
break;
case 'c':
break;
case 'p':
if (lt->tm_hour >= 12) {
- len = strlen(s_pm_up); CHECK_SIZE();
- snprintf(curpos, buflen-total_done, s_pm_up);
+ len = s_pm_up_len; CHECK_SIZE();
+ snprintf(curpos, buflen-total_done, "%s", s_pm_up);
} else {
- len = strlen(s_am_up); CHECK_SIZE();
- snprintf(curpos, buflen-total_done, s_am_up);
+ len = s_am_up_len; CHECK_SIZE();
+ snprintf(curpos, buflen-total_done, "%s", s_am_up);
}
break;
case 'P':
if (lt->tm_hour >= 12) {
- len = strlen(s_pm_low); CHECK_SIZE();
- snprintf(curpos, buflen-total_done, s_pm_low);
+ len = s_pm_low_len; CHECK_SIZE();
+ snprintf(curpos, buflen-total_done, "%s", s_pm_low);
} else {
- len = strlen(s_am_low); CHECK_SIZE();
- snprintf(curpos, buflen-total_done, s_am_low);
+ len = s_am_low_len; CHECK_SIZE();
+ snprintf(curpos, buflen-total_done, "%s", s_am_low);
}
break;
case 'r':
*curpos++ = '0'+(lt->tm_min % 10);
break;
case 's':
- snprintf(subbuf, buflen - total_done, "%ld", mktime(lt));
+ snprintf(subbuf, 64, "%ld", mktime(lt));
len = strlen(subbuf); CHECK_SIZE();
strncpy2(curpos, subbuf, buflen - total_done);
break;
format++;
break;
default:
- g_warning("format error (%c)", *format);
+ if (format && *format)
+ g_warning("format error (%c)", *format);
*curpos = '\0';
return total_done;
}
NULL, NULL, NULL, NULL, &status, NULL);
debug_print("%s %s exited with status %d\n",
args[0], filename, WEXITSTATUS(status));
- truncate(filename, 0);
+ if (truncate(filename, 0) < 0)
+ g_warning("couln't truncate");
}
}
}
projects / claws.git / blobdiff