pegasus/weechat
1
0
Fork 0
mirror of https://github.com/weechat/weechat.git synced 2026-07-01 07:16:37 +02:00
Code Activity

core: display curl error after a failed download

Browse Source
This commit is contained in:
Sébastien Helleu
2014-07-05 22:17:55 +02:00
parent 2b7b8cb365
commit 4350dd058e
15 changed files with 75 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ChangeLog.asciidoc
+1
View File
@@ -15,6 +15,7 @@ http://weechat.org/files/releasenotes/ReleaseNotes-devel.html[release notes]
== Version 1.0 (under dev)
* core: display curl error after a failed download
* core: do not display content of passphrase on /secure buffer
* core: add option "env" in command /set (manage environment variables)
* core: fix potential memory leak with infolists not freed in plugins
po/cs.po
+5 -1
View File
@@ -20,7 +20,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2014-06-29 11:41+0200\n"
"POT-Creation-Date: 2014-07-05 22:14+0200\n"
"PO-Revision-Date: 2014-06-28 13:18+0200\n"
"Last-Translator: Jiri Golembiovsky <golemj@gmail.com>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -3972,6 +3972,10 @@ msgstr ""
"čtení - špatný podpis (formát aktualizačního souboru se mohl změnit od "
"poslední verze)"
#, c-format
msgid "curl error %d (%s) (URL: \"%s\")\n"
msgstr ""
#, c-format
msgid "%sError: invalid limit for resource \"%s\": %s (must be >= -1)"
msgstr ""
po/de.po
+5 -1
View File
@@ -22,7 +22,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2014-06-29 11:41+0200\n"
"POT-Creation-Date: 2014-07-05 22:14+0200\n"
"PO-Revision-Date: 2014-06-29 12:38+0100\n"
"Last-Translator: Nils Görs <weechatter@arcor.de>\n"
"Language-Team: German <weechatter@arcor.de>\n"
@@ -4645,6 +4645,10 @@ msgstr ""
"lese - falsche Signatur (das Dateiformat wurde vermutlich seit der letzten "
"Version verändern)"
#, c-format
msgid "curl error %d (%s) (URL: \"%s\")\n"
msgstr ""
#, c-format
msgid "%sError: invalid limit for resource \"%s\": %s (must be >= -1)"
msgstr ""
po/es.po
+5 -1
View File
@@ -22,7 +22,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2014-06-29 11:41+0200\n"
"POT-Creation-Date: 2014-07-05 22:14+0200\n"
"PO-Revision-Date: 2014-06-28 13:18+0200\n"
"Last-Translator: Elián Hanisch <lambdae2@gmail.com>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -4183,6 +4183,10 @@ msgstr ""
"lectura - firma incorrecta (el formato del archivo de actualización puede "
"haber cambiado desde la última versión)"
#, c-format
msgid "curl error %d (%s) (URL: \"%s\")\n"
msgstr ""
#, c-format
msgid "%sError: invalid limit for resource \"%s\": %s (must be >= -1)"
msgstr "%sError: límite inválido para el recurso \"%s\": %s (debe ser >= -1)"
po/fr.po
+6 -2
View File
@@ -21,8 +21,8 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2014-06-29 11:41+0200\n"
"PO-Revision-Date: 2014-06-29 11:44+0200\n"
"POT-Creation-Date: 2014-07-05 22:14+0200\n"
"PO-Revision-Date: 2014-07-05 22:15+0200\n"
"Last-Translator: Sébastien Helleu <flashcode@flashtux.org>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
"Language: fr\n"
@@ -4542,6 +4542,10 @@ msgstr ""
"lecture - mauvaise signature (le format de fichier upgrade a peut-être "
"changé depuis la dernière version)"
#, c-format
msgid "curl error %d (%s) (URL: \"%s\")\n"
msgstr "erreur curl %d (%s) (URL : \"%s\")\n"
#, c-format
msgid "%sError: invalid limit for resource \"%s\": %s (must be >= -1)"
msgstr "%sErreur : limite de ressource \"%s\" invalide : %s (doit être >= 1)"
po/hu.po
+5 -1
View File
@@ -20,7 +20,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2014-06-29 11:41+0200\n"
"POT-Creation-Date: 2014-07-05 22:14+0200\n"
"PO-Revision-Date: 2014-06-28 13:18+0200\n"
"Last-Translator: Andras Voroskoi <voroskoi@frugalware.org>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -3599,6 +3599,10 @@ msgid ""
"version)"
msgstr ""
#, c-format
msgid "curl error %d (%s) (URL: \"%s\")\n"
msgstr ""
#, c-format
msgid "%sError: invalid limit for resource \"%s\": %s (must be >= -1)"
msgstr ""
po/it.po
+5 -1
View File
@@ -20,7 +20,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2014-06-29 11:41+0200\n"
"POT-Creation-Date: 2014-07-05 22:14+0200\n"
"PO-Revision-Date: 2014-06-28 14:49+0200\n"
"Last-Translator: Esteban I. Ruiz Moreno <exio4.com@gmail.com>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -4306,6 +4306,10 @@ msgstr ""
"lettura - firma errata (l'aggiornamento del formato del file potrebbe essere "
"cambiato dall'ultima versione)"
#, c-format
msgid "curl error %d (%s) (URL: \"%s\")\n"
msgstr ""
#, c-format
msgid "%sError: invalid limit for resource \"%s\": %s (must be >= -1)"
msgstr ""
po/ja.po
+5 -1
View File
@@ -20,7 +20,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2014-06-29 11:41+0200\n"
"POT-Creation-Date: 2014-07-05 22:14+0200\n"
"PO-Revision-Date: 2014-06-28 14:49+0200\n"
"Last-Translator: AYANOKOUZI, Ryuunosuke <i38w7i3@yahoo.co.jp>\n"
"Language-Team: Japanese <https://github.com/l/weechat/tree/translation_ja>\n"
@@ -4353,6 +4353,10 @@ msgstr ""
"読み込み - 不正な署名 (ファイルフォーマットのアップグレードが最新バージョンか"
"ら変更された可能性があります)"
#, c-format
msgid "curl error %d (%s) (URL: \"%s\")\n"
msgstr ""
#, c-format
msgid "%sError: invalid limit for resource \"%s\": %s (must be >= -1)"
msgstr ""
po/pl.po
+5 -1
View File
@@ -21,7 +21,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2014-06-29 11:41+0200\n"
"POT-Creation-Date: 2014-07-05 22:14+0200\n"
"PO-Revision-Date: 2014-06-28 14:49+0200\n"
"Last-Translator: Krzysztof Korościk <soltys@szluug.org>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -4427,6 +4427,10 @@ msgid ""
msgstr ""
"odczyt - zła sygnatura (format pliku mógł ulec zmianie od poprzedniej wersji)"
#, c-format
msgid "curl error %d (%s) (URL: \"%s\")\n"
msgstr ""
#, c-format
msgid "%sError: invalid limit for resource \"%s\": %s (must be >= -1)"
msgstr "%sBłąd: zły limit dla zasobu \"%s\": %s (musi być >= -1)"
po/pt_BR.po
+5 -1
View File
@@ -21,7 +21,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2014-06-29 11:41+0200\n"
"POT-Creation-Date: 2014-07-05 22:14+0200\n"
"PO-Revision-Date: 2014-06-28 13:18+0200\n"
"Last-Translator: Sergio Durigan Junior <sergiosdj@gmail.com>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -4070,6 +4070,10 @@ msgid ""
"version)"
msgstr ""
#, c-format
msgid "curl error %d (%s) (URL: \"%s\")\n"
msgstr ""
#, c-format
msgid "%sError: invalid limit for resource \"%s\": %s (must be >= -1)"
msgstr ""
po/ru.po
+5 -1
View File
@@ -21,7 +21,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2014-06-29 11:41+0200\n"
"POT-Creation-Date: 2014-07-05 22:14+0200\n"
"PO-Revision-Date: 2014-06-28 13:18+0200\n"
"Last-Translator: Aleksey V Zapparov AKA ixti <ixti@member.fsf.org>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -3628,6 +3628,10 @@ msgid ""
"version)"
msgstr ""
#, c-format
msgid "curl error %d (%s) (URL: \"%s\")\n"
msgstr ""
#, c-format
msgid "%sError: invalid limit for resource \"%s\": %s (must be >= -1)"
msgstr ""
po/tr.po
+5 -1
View File
@@ -20,7 +20,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2014-06-29 11:41+0200\n"
"POT-Creation-Date: 2014-07-05 22:14+0200\n"
"PO-Revision-Date: 2014-06-28 13:18+0200\n"
"Last-Translator: Hasan Kiran <sunder67@hotmail.com>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -3234,6 +3234,10 @@ msgid ""
"version)"
msgstr ""
#, c-format
msgid "curl error %d (%s) (URL: \"%s\")\n"
msgstr ""
#, c-format
msgid "%sError: invalid limit for resource \"%s\": %s (must be >= -1)"
msgstr ""
po/weechat.pot
+5 -1
View File
@@ -21,7 +21,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.4.1-dev\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2014-06-29 11:41+0200\n"
"POT-Creation-Date: 2014-07-05 22:14+0200\n"
"PO-Revision-Date: 2013-02-14 18:20+0100\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -3234,6 +3234,10 @@ msgid ""
"version)"
msgstr ""
#, c-format
msgid "curl error %d (%s) (URL: \"%s\")\n"
msgstr ""
#, c-format
msgid "%sError: invalid limit for resource \"%s\": %s (must be >= -1)"
msgstr ""
src/core/wee-hook.c
-2
View File
@@ -1528,8 +1528,6 @@ hook_process_child (struct t_hook *hook_process)
ptr_url++;
}
rc = weeurl_download (ptr_url, HOOK_PROCESS(hook_process, options));
if (rc != 0)
fprintf (stderr, "Error with URL '%s'\n", ptr_url);
}
else
{
src/core/wee-url.c
+13 -2
View File
@@ -885,6 +885,8 @@ struct t_url_option url_options[] =
{ NULL, 0, 0, NULL },
};
char url_error[CURL_ERROR_SIZE + 1];
/*
* Searches for a constant in array of constants.
@@ -1160,7 +1162,7 @@ weeurl_download (const char *url, struct t_hashtable *options)
CURLoption url_file_opt_data[2] = { CURLOPT_READDATA, CURLOPT_WRITEDATA };
void *url_file_opt_cb[2] = { &weeurl_read, &weeurl_write };
struct t_proxy *ptr_proxy;
int rc, i;
int rc, curl_rc, i;
rc = 0;
@@ -1219,9 +1221,18 @@ weeurl_download (const char *url, struct t_hashtable *options)
/* set other options in hashtable */
hashtable_map (options, &weeurl_option_map_cb, curl);
/* set error buffer */
curl_easy_setopt (curl, CURLOPT_ERRORBUFFER, url_error);
/* perform action! */
if (curl_easy_perform (curl) != CURLE_OK)
curl_rc = curl_easy_perform (curl);
if (curl_rc != CURLE_OK)
{
fprintf (stderr,
_("curl error %d (%s) (URL: \"%s\")\n"),
curl_rc, url_error, url);
rc = 2;
}
/* cleanup */
curl_easy_cleanup (curl);