[gvfs] ftp: Fix FTP date parsing of midnight for DOS format
- From: Ross Lagerwall <rossl src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gvfs] ftp: Fix FTP date parsing of midnight for DOS format
- Date: Sun, 8 Mar 2015 09:10:26 +0000 (UTC)
commit 57caa7fad4bc4532366f557b5eda95357a23b101
Author: Ross Lagerwall <rosslagerwall gmail com>
Date: Sat Feb 28 12:48:07 2015 +0000
ftp: Fix FTP date parsing of midnight for DOS format
Fix from upstream:
http://hg.mozilla.org/mozilla-central/rev/2c21b94a7775
https://bugzilla.mozilla.org/show_bug.cgi?id=961346
https://bugzilla.gnome.org/show_bug.cgi?id=601583
daemon/ParseFTPList.c | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
---
diff --git a/daemon/ParseFTPList.c b/daemon/ParseFTPList.c
index a930099..6d171fd 100644
--- a/daemon/ParseFTPList.c
+++ b/daemon/ParseFTPList.c
@@ -839,6 +839,8 @@ int ParseFTPList(const char *line, struct list_state *state,
result->fe_time.tm_min = atoi(tokens[1]+3);
if ((tokens[1][5]) == 'P' && result->fe_time.tm_hour < 12)
result->fe_time.tm_hour += 12;
+ else if ((tokens[1][5]) == 'A' && result->fe_time.tm_hour == 12)
+ result->fe_time.tm_hour = 0;
/* the caller should do this (if dropping "." and ".." is desired)
if (result->fe_type == 'd' && result->fe_fname[0] == '.' &&
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]