On 02/13/2014 10:30 AM, Sergey Poznyakoff wrote:
Any objections to pushing the latest version of this patch to git head?
Thanks, it looks good to me. Maybe also fold in the attached minor
change, which simplifies the code and which I don't think will hurt
performance significantly. But it's no big deal either way.
diff --git a/lib/savedir.c b/lib/savedir.c
index badf602..e263c5d 100644
--- a/lib/savedir.c
+++ b/lib/savedir.c
@@ -40,7 +40,6 @@
typedef struct
{
char *name;
- size_t size;
#if D_INO_IN_DIRENT
ino_t ino;
#endif
@@ -128,7 +127,6 @@ streamsavedir (DIR *dirp, enum savedir_option option)
entries_allocated = n;
}
entries[entries_used].name = xstrdup (entry);
- entries[entries_used].size = entry_size;
#if D_INO_IN_DIRENT
entries[entries_used].ino = dp->d_ino;
#endif
@@ -168,8 +166,8 @@ streamsavedir (DIR *dirp, enum savedir_option option)
used = 0;
for (i = 0; i < entries_used; i++)
{
- memcpy (name_space + used, entries[i].name, entries[i].size);
- used += entries[i].size;
+ strcpy (name_space + used, entries[i].name);
+ used += strlen (name_space + used) + 1;
free (entries[i].name);
}
free (entries);