From 94d0c146e6112e82053cfbe0868cd3c24cd44d8d Mon Sep 17 00:00:00 2001
From: Brenden Matthews <brenden1@rty.ca>
Date: Tue, 26 Jul 2005 04:35:08 +0000
Subject: [PATCH] small fix in metar stuff

git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky@17 7f574dfc-610e-0410-a909-a81674777703
---
 changelog.html | 351 -------------------------------------------------
 metarinfo.c    |   3 +
 2 files changed, 3 insertions(+), 351 deletions(-)
 delete mode 100644 changelog.html

diff --git a/changelog.html b/changelog.html
deleted file mode 100644
index ac5130f5..00000000
--- a/changelog.html
+++ /dev/null
@@ -1,351 +0,0 @@
-<H3>2005-07-17</H3>
-<UL>
-  <LI>Fixed a pile of bugs in configure script
-  <LI>Added proper checking for headers in configure script
-  <LI>Made METAR shit threaded so it would stop being retarded, also made
-      it try more then once to update
-  <LI>Added $metar_temp_f and ${i2c tempf} for americans
-</UL>
-<H3></H3>
-<UL>
-</UL>
-<H3>2005-07-16</H3>
-<UL>
-  <LI>Added option for Conky to update N times and quit, see
-      total_run_times in conkyrc.sample
-  <LI>Added metar code for weather info, thanks to somebody on sf.net
-  <LI>Added $alignr and $alignc for right and centre alignment
-  <LI>Added wireless info and IP addr patch, thanks Bobby Beckmann,
-      options $addr and $linkstatus (please test!), as well as fixed a mem
-      leak in this patch
-  <LI>adt746x fix, thanks to dan-h on sf.net
-  <LI>Added mldonkey support patch, thanks Lucas Brutschy on sf.net
-  <LI>Added patch to allow hex colour values, thanks roiban adi on sf.net
-  <LI>Added if constructs patch, thanks Lucas Brutschy on sf.net
-  <LI>Fixed bug in tab code (hopefully for the last time)
-  <LI>Added option to sort by cpu or memory for top, see top_sort_cpu
-</UL>
-<H3></H3>
-<UL>
-</UL>
-<H3>2005-07-12</H3>
-<UL>
-  <LI>Added fix for battery charged state (thanks to Lukas Zapletal
-      <lzap@seznam.cz>)
-</UL>
-<H3></H3>
-<UL>
-</UL>
-<H3>2005-07-05</H3>
-<UL>
-  <LI>Conky 1.1 released
-</UL>
-<H3></H3>
-<UL>
-</UL>
-<H3>2005-07-03</H3>
-<UL>
-  <LI>Added $mpd_bar and $mpd_bitrate
-  <LI>Some minor code cleanups prior to release
-  <LI>Fixed problem with Conky not compiling when XFT disabled
-  <LI>Fixed configure.in problems with Xdbe
-</UL>
-<H3></H3>
-<UL>
-</UL>
-<H3>2005-07-01</H3>
-<UL>
-  <LI>Fixed memory leak in MPD code
-  <LI>Added new $tail object (see conkyrc.sample) which loves to suck CPU
-      and memory
-  <LI>Fixed more mem leaks
-</UL>
-<H3></H3>
-<UL>
-</UL>
-<H3>2005-06-30</H3>
-<UL>
-  <LI>Added use_spacer to config
-  <LI>Added $mpd_status
-  <LI>Added small fix for i2c from Filedil on forums.gentoo.org
-</UL>
-<H3></H3>
-<UL>
-</UL>
-<H3>2005-06-28</H3>
-<UL>
-  <LI>Made it possible to use tabs to right-justify (just add a bunch)
-  <LI>Added ${execbar} (see conkyrc.sample)
-</UL>
-<H3></H3>
-<UL>
-</UL>
-<H3>2005-06-26</H3>
-<UL>
-  <LI>Added memory % to top output
-  <LI>Added initial cairo backend (it's really quite useless at this stage actually, and I'm not sure if there is even any point to it)
-</UL>
-<H3></H3>
-<UL>
-</UL>
-<H3>2005-06-25</H3>
-<UL>
-  <LI>Conky now recognizes the tab character correctly
-  <LI>Added simple config option to print to stdout (out_to_console
-      <yes/no>)
-</UL>
-<H3></H3>
-<UL>
-</UL>
-<H3>2005-06-23</H3>
-<UL>
-  <LI>Added top output.  Check the sample config.
-  <LI>Cleaned up code.
-</UL>
-<H3></H3>
-<UL>
-</UL>
-<H3>2005-06-22</H3>
-<UL>
-  <LI>Finished MPD support ($mpd_title, $mpd_artist, $mpd_album, $mpd_vol)
-  <LI>Removed NVCtrl code
-  <LI>Added noswap and i2c patches
-</UL>
-<H3></H3>
-<UL>
-</UL>
-<H3>2005-06-21</H3>
-<UL>
-  <LI>Version 1.0. Conky is born from the ashes of torsmo. Main site: http://conky.rty.ca/
-  <LI>Added xwin patch
-  <LI>Added new feature for sample averaging of CPU and net info
-</UL>
-<H3></H3>
-<UL>
-</UL>
-<H3>2004-12-22</H3>
-<UL>
-  <LI>Version 0.18 released
-</UL>
-<H3></H3>
-<UL>
-</UL>
-<H3>2004-12-21</H3>
-<UL>
-  <LI>Fixed some double buffer + Xft stuff
-  <LI>Applied X-Mozilla-Status patch (thanks affinity)
-  <LI>Applied NVCtrl patch and modified it a bit (temperature monitoring
-      for nvdia-based graphics cards) (I couldn't test this so it may or
-      may not work or even compile) (thanks Dennis Frommknecht)
-  <LI>Applied fs_used_perc and fs_bar_free patch (thanks killfire [send me
-      mail, I didn't catch your name from sourceforge])
-  <LI>Applied patch that supports mailbox that is in some 'maildir' format
-      (thanks jolapache [send mail, I didn't catch your name from
-      sourceforge])
-  <LI>min -&gt; m
-  <LI>Applied pad_percents patch (thanks JL Farinacci)
-  <LI>Fixed some stuff in acpi fan and acpi ac adapter
-  <LI>Optional XFT even when compiled in
-</UL>
-<H3></H3>
-<UL>
-</UL>
-<H3>2004-11-30</H3>
-<UL>
-  <LI>Applied utime patch (UTC time) (thanks David McCabe)
-</UL>
-<H3></H3>
-<UL>
-</UL>
-<H3>2004-11-29</H3>
-<UL>
-  <LI>Applied Xdbe patch, this includes double_buffer configuration and
-      -b command line option (thanks Bruce Merry)
-  <LI>Applied some other seti patch, not tested (thanks William DiPlacido)
-</UL>
-<H3></H3>
-<UL>
-</UL>
-<H3>2004-08-25</H3>
-<UL>
-  <LI>Applied netbsd patch (thanks Rui Paulo)
-  <LI>Applied cpu frequency patch (thanks William DiPlacido)
-  <LI>Applied adt746x patch (thanks Dennis Kaandorp)
-  <LI>Applied some other FreeBSD patch by the same guy
-</UL>
-<H3></H3>
-<UL>
-</UL>
-<H3>2004-07-31</H3>
-<UL>
-  <LI>Applied FreeBSD patch (thanks Roman Bogorodskiy)
-</UL>
-<H3></H3>
-<UL>
-</UL>
-<H3>2004-07-25</H3>
-<UL>
-  <LI>Xft support and xftfont configuration
-  <LI>rewrote some stuff, there might be some new bugs in old places
-</UL>
-<H3></H3>
-<UL>
-</UL>
-<H3>2004-07-24</H3>
-<UL>
-  <LI>I2C divisor from a file (thanks Falk Feuersenger)
-</UL>
-<H3></H3>
-<UL>
-</UL>
-<H3>2004-07-20</H3>
-<UL>
-  <LI>changed battery thing to ${battery &lt;filename in
-      /proc/acpi/battery/>}
-  <LI>SETI@Home stuff (thanks Jarski)
-</UL>
-<H3></H3>
-<UL>
-</UL>
-<H3>2004-07-05</H3>
-<UL>
-  <LI>changed signal for config file reloading to SIGUSR1
-  <LI>mixer stuff, $mixer, $mixerl, $mixerr, $mixerbar, $mixerlbar,
-      $mixerrbar
-</UL>
-<H3></H3>
-<UL>
-</UL>
-<H3>2004-06-03</H3>
-<UL>
-  <LI>maybe fixed acpi battery thing when "present rate" isn't known
-</UL>
-<H3></H3>
-<UL>
-</UL>
-<H3>2004-06-01</H3>
-<UL>
-  <LI>fixed width for all bars, use like ${cpubar 4,50}
-</UL>
-<H3></H3>
-<UL>
-</UL>
-<H3>2004-05-25</H3>
-<UL>
-  <LI>Version 0.17 released
-</UL>
-<H3></H3>
-<UL>
-</UL>
-<H3>2004-05-23</H3>
-<UL>
-  <LI>battery number for ACPI battery (thanks Leszek Krupiñski)
-  <LI>default battery is now BAT0 instead of BAT1, set ${battery 1} if
-      the old battery thing worked
-  <LI>bug fix on load average reporting (thanks Leszek Krupiñski)
-  <LI>outlines to text, draw_outline and default_outline_color
-      configurations and $outlinecolor (thanks adi)
-  <LI>$acpifan, $acpiacadapter, $uptime_short (thanks adi)
-</UL>
-<H3></H3>
-<UL>
-</UL>
-<H3>2004-05-19</H3>
-<UL>
-  <LI>fixed a bug when starting after Opera (and some other programs)
-  <LI>sticky window
-  <LI>minimum_size
-</UL>
-<H3></H3>
-<UL>
-</UL>
-<H3>2004-05-18</H3>
-<UL>
-  <LI>added border_width configuration
-</UL>
-<H3></H3>
-<UL>
-</UL>
-<H3>2004-05-16</H3>
-<UL>
-  <LI>fixed zero length bar bug
-</UL>
-<H3></H3>
-<UL>
-</UL>
-<H3>2004-05-15</H3>
-<UL>
-  <LI>file system stats, $fs_bar, $fs_free, $fs_free_perc, $fs_size,
-      $fs_used
-  <LI>leaves ACPI temperature file open (faster)
-  <LI>-a option to change alignment on command line
-</UL>
-<H3></H3>
-<UL>
-</UL>
-<H3>2004-05-14</H3>
-<UL>
-  <LI>fixed ACPI temperature bug
-  <LI>border_margin configuration
-  <LI>${execi &lt;interval&gt; &lt;command&gt;}, execute with specific interval
-  <LI>added possibility to manually set the position (-x and -y options)
-      (thanks to Gwenhael LE MOINE)
-  <LI>$buffers and $cached (thanks to Jeremy Burch)
-  <LI>WM_CLASS when drawing to own window (thanks to Gwenhael LE MOINE)
-</UL>
-<H3></H3>
-<UL>
-</UL>
-<H3>2004-05-14</H3>
-<UL>
-  <LI>Version 0.16 released
-</UL>
-<H3></H3>
-<UL>
-</UL>
-<H3>2004-05-13</H3>
-<UL>
-  <LI>$pre_exec, execute a shell command one time
-  <LI>preparsing of text (faster but more memory usage)
-  <LI>less system calls (faster)
-  <LI>APM things to $battery (untested)
-</UL>
-<H3></H3>
-<UL>
-</UL>
-<H3>2004-05-12</H3>
-<UL>
-  <LI>added $new_mails changed $mails to tell total mail count
-</UL>
-<H3></H3>
-<UL>
-</UL>
-<H3>2004-05-11</H3>
-<UL>
-  <LI>transparent window, own_window configuration, -o cmdline option
-  <LI>$exec, execute a shell command
-  <LI>$acpitemp, $battery - acpi stuff (not really tested)
-</UL>
-<H3></H3>
-<UL>
-</UL>
-<H3>2004-05-10</H3>
-<UL>
-  <LI>$loadavg, load average
-  <LI>$mails, unread local mails, mail_spool configuration
-</UL>
-<H3></H3>
-<UL>
-</UL>
-<H3>2004-05-09</H3>
-<UL>
-  <LI>Version 0.15 released
-</UL>
-<H3></H3>
-<UL>
-</UL>
-<H3>2004-05-06</H3>
-<UL>
-  <LI>SIGHUP reloads config file (thanks Jørgen P. Tjernø)
-  <LI>Some other stuff
-</UL>
diff --git a/metarinfo.c b/metarinfo.c
index 44e80ab8..6f01dc20 100644
--- a/metarinfo.c
+++ b/metarinfo.c
@@ -105,16 +105,19 @@ void *fetch_ftp( ) {
 		res = connectFtp(metar_server, 0);
 		if (res < 0) {
 			ERR("Couldn't connect to %s\n", metar_server);
+			status = 1;
 			return NULL;
 		}
 		res = changeFtpDirectory(metar_path);
 		if (res < 0) {
 			ERR("Metar update failed (couldn't CWD to %s)\n", metar_path);
 			disconnectFtp();
+			status = 1;
 			return NULL;
 		}
 		if (res == 0) {
 			ERR("Metar update failed\n");
+			status = 1;
 			return NULL;
 		}
 		if (getFtp(ftpData, NULL, metar_station) < 0) {