mirrors/mc
1
0
Fork 0
mirror of https://github.com/MidnightCommander/mc synced 2025-01-03 01:54:24 +03:00
Code Issues Packages Projects Releases Wiki Activity

(parse_ls_line): get rid of extra string duplication.

Browse Source 
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
This commit is contained in:
Andrew Borodin 2015-01-15 11:16:39 +03:00
parent 804186bbd8
commit d4cbed25cc
1 changed files with 9 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/vfs/ftpfs/ftpfs_parse_ls.c
View File

@ -70,7 +70,6 @@
#define FIRST_TOKEN_R strtok_r (line, " \t", &next) #define FIRST_TOKEN_R strtok_r (line, " \t", &next)
#define NEXT_TOKEN_R strtok_r (NULL, " \t", &next) #define NEXT_TOKEN_R strtok_r (NULL, " \t", &next)
#define ERR1 do { g_free (line); return FALSE; } while (FALSE)
#define ERR2 do { (*err)++; return FALSE; } while (FALSE) #define ERR2 do { (*err)++; return FALSE; } while (FALSE)
/*** file scope type declarations ****************************************************************/ /*** file scope type declarations ****************************************************************/
@ -280,9 +279,8 @@ ftpfs_convert_date (const char *s)
*/ */
static gboolean static gboolean
parse_ls_line (char *line_c, struct stat *s, char **filename, char **linkname) parse_ls_line (char *line, struct stat *s, char **filename, char **linkname)
{ {
char *line;
char *next = NULL; char *next = NULL;
char *t; char *t;
mode_t type, mode = 0; mode_t type, mode = 0;
@ -292,18 +290,13 @@ parse_ls_line (char *line_c, struct stat *s, char **filename, char **linkname)
gboolean year_anomaly = FALSE; gboolean year_anomaly = FALSE;
char *name; char *name;
line = g_strdup (line_c);
/* parse perms */ /* parse perms */
t = FIRST_TOKEN_R; t = FIRST_TOKEN_R;
if (t == NULL) if (t == NULL)
ERR1; return FALSE;
if (!vfs_parse_filetype (t, NULL, &type)) if (!vfs_parse_filetype (t, NULL, &type))
{
g_free (line);
return FALSE; return FALSE;
}
if (vfs_parse_fileperms (t + 1, NULL, &mode)) if (vfs_parse_fileperms (t + 1, NULL, &mode))
mode |= type; mode |= type;
@ -313,13 +306,13 @@ parse_ls_line (char *line_c, struct stat *s, char **filename, char **linkname)
/* link count */ /* link count */
t = NEXT_TOKEN_R; t = NEXT_TOKEN_R;
if (t == NULL) if (t == NULL)
ERR1; return FALSE;
s->st_nlink = atol (t); s->st_nlink = atol (t);
/* user */ /* user */
t = NEXT_TOKEN_R; t = NEXT_TOKEN_R;
if (t == NULL) if (t == NULL)
ERR1; return FALSE;
s->st_uid = ftpfs_get_uid (t); s->st_uid = ftpfs_get_uid (t);
@ -329,7 +322,7 @@ parse_ls_line (char *line_c, struct stat *s, char **filename, char **linkname)
/* size or month */ /* size or month */
t = NEXT_TOKEN_R; t = NEXT_TOKEN_R;
if (t == NULL) if (t == NULL)
ERR1; return FALSE;
if (isdigit ((unsigned char) *t)) if (isdigit ((unsigned char) *t))
{ {
/* it's size, so the previous was group: */ /* it's size, so the previous was group: */
@ -342,7 +335,7 @@ parse_ls_line (char *line_c, struct stat *s, char **filename, char **linkname)
s->st_size = (off_t) size; s->st_size = (off_t) size;
t = NEXT_TOKEN_R; t = NEXT_TOKEN_R;
if (t == NULL) if (t == NULL)
ERR1; return FALSE;
} }
else else
{ {
@ -368,13 +361,13 @@ parse_ls_line (char *line_c, struct stat *s, char **filename, char **linkname)
day_of_month = NEXT_TOKEN_R; day_of_month = NEXT_TOKEN_R;
if (day_of_month == NULL) if (day_of_month == NULL)
ERR1; return FALSE;
date.tm_mday = atoi (day_of_month); date.tm_mday = atoi (day_of_month);
/* time or year */ /* time or year */
t = NEXT_TOKEN_R; t = NEXT_TOKEN_R;
if (t == NULL) if (t == NULL)
ERR1; return FALSE;
date.tm_isdst = -1; date.tm_isdst = -1;
date.tm_hour = date.tm_min = 0; date.tm_hour = date.tm_min = 0;
date.tm_sec = 30; date.tm_sec = 30;
@ -399,7 +392,7 @@ parse_ls_line (char *line_c, struct stat *s, char **filename, char **linkname)
name = strtok_r (NULL, "", &next); name = strtok_r (NULL, "", &next);
if (name == NULL) if (name == NULL)
ERR1; return FALSE;
/* there are ls which output extra space after year. */ /* there are ls which output extra space after year. */
if (year_anomaly && *name == ' ') if (year_anomaly && *name == ' ')
@ -422,8 +415,6 @@ parse_ls_line (char *line_c, struct stat *s, char **filename, char **linkname)
*filename = g_strdup (name); *filename = g_strdup (name);
g_free (line);
return TRUE; return TRUE;
} }