/* libguestfs - the guestfsd daemon
- * Copyright (C) 2009 Red Hat Inc.
+ * Copyright (C) 2009-2011 Red Hat Inc.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include <config.h>
char **ret = NULL;
int size = 0, alloc = 0;
unsigned int i;
- FILE *fp;
+ FILE *fp = NULL;
guestfs_int_inotify_event_list *events;
char buf[PATH_MAX];
+ char tempfile[] = "/tmp/inotifyXXXXXX";
+ int fd;
+ char cmd[64];
NEED_INOTIFY (NULL);
- fp = popen ("sort -u > /tmp/inotify", "w");
+ fd = mkstemp (tempfile);
+ if (fd == -1) {
+ reply_with_perror ("mkstemp");
+ return NULL;
+ }
+
+ snprintf (cmd, sizeof cmd, "sort -u > %s", tempfile);
+
+ fp = popen (cmd, "w");
if (fp == NULL) {
reply_with_perror ("sort");
return NULL;
pclose (fp);
- fp = fopen ("/tmp/inotify", "r");
+ fp = fdopen (fd, "r");
if (fp == NULL) {
- reply_with_perror ("/tmp/inotify");
+ reply_with_perror ("%s", tempfile);
+ unlink (tempfile);
+ close (fd);
return NULL;
}
if (len > 0 && buf[len-1] == '\n')
buf[len-1] = '\0';
- if (add_string (&ret, &size, &alloc, buf) == -1) {
- fclose (fp);
+ if (add_string (&ret, &size, &alloc, buf) == -1)
goto error;
- }
}
- fclose (fp);
+ fclose (fp); /* implicitly closes fd */
+ fp = NULL;
if (add_string (&ret, &size, &alloc, NULL) == -1)
goto error;
- unlink ("/tmp/inotify");
+ unlink (tempfile);
return ret;
error:
- unlink ("/tmp/inotify");
+ if (fp != NULL)
+ fclose (fp);
+
+ unlink (tempfile);
return NULL;
#else
NOT_AVAILABLE (NULL);