aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2011-12-18 06:31:29 +0000
committerMike Frysinger <vapier@gentoo.org>2011-12-18 06:31:29 +0000
commitdf85a319d8c1dad9001a7ed1bcd151e65426540a (patch)
treebbbc13759a85a58d93693f7d0d33e37a73ba1dcc /qxpak.c
parentexpand nested variables when using known important ones #307625 by Wilke Schw... (diff)
downloadportage-utils-df85a319d8c1dad9001a7ed1bcd151e65426540a.tar.gz
portage-utils-df85a319d8c1dad9001a7ed1bcd151e65426540a.tar.bz2
portage-utils-df85a319d8c1dad9001a7ed1bcd151e65426540a.zip
add some scandir helpers to optimize things
Diffstat (limited to 'qxpak.c')
-rw-r--r--qxpak.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/qxpak.c b/qxpak.c
index 83d7f9a..28da5b9 100644
--- a/qxpak.c
+++ b/qxpak.c
@@ -1,7 +1,7 @@
/*
* Copyright 2005-2010 Gentoo Foundation
* Distributed under the terms of the GNU General Public License v2
- * $Header: /var/cvsroot/gentoo-projects/portage-utils/qxpak.c,v 1.22 2011/02/28 18:21:42 vapier Exp $
+ * $Header: /var/cvsroot/gentoo-projects/portage-utils/qxpak.c,v 1.23 2011/12/18 06:31:29 vapier Exp $
*
* Copyright 2005-2010 Ned Ludd - <solar@gentoo.org>
* Copyright 2005-2010 Mike Frysinger - <vapier@gentoo.org>
@@ -46,7 +46,7 @@ static const char * const qxpak_opts_help[] = {
"Write files to stdout",
COMMON_OPTS_HELP
};
-static const char qxpak_rcsid[] = "$Id: qxpak.c,v 1.22 2011/02/28 18:21:42 vapier Exp $";
+static const char qxpak_rcsid[] = "$Id: qxpak.c,v 1.23 2011/12/18 06:31:29 vapier Exp $";
#define qxpak_usage(ret) usage(ret, QXPAK_FLAGS, qxpak_long_opts, qxpak_opts_help, lookup_applet_idx("qxpak"))
typedef struct {
@@ -345,8 +345,7 @@ xpak_create(int dir_fd, const char *file, int argc, char **argv)
stat(path, &st);
_xpak_add_file(dir_fd, path, &st, findex, &index_len, fdata, &data_len);
}
- while (numfiles--) free(dir[numfiles]);
- free(dir);
+ scandir_free(dir, numfiles);
} else if (S_ISREG(st.st_mode)) {
_xpak_add_file(dir_fd, argv[i], &st, findex, &index_len, fdata, &data_len);
} else