From d26c3387dff0198904754fc0cedfa069740262d7 Mon Sep 17 00:00:00 2001 From: Jim Meyering Date: Mon, 2 Feb 2009 20:35:14 +0000 Subject: tests: diagnose more open failures * tests/qemuxml2argvtest.c: Revert the change, "tests: diagnose open failure" of 2009-01-30. * tests/testutils.c (virtTestLoadFile): Diagnose failure here. --- tests/testutils.c | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) (limited to 'tests/testutils.c') diff --git a/tests/testutils.c b/tests/testutils.c index e8b07fc60..8d8f82d11 100644 --- a/tests/testutils.c +++ b/tests/testutils.c @@ -1,7 +1,7 @@ /* * testutils.c: basic test utils * - * Copyright (C) 2005-2008 Red Hat, Inc. + * Copyright (C) 2005-2009 Red Hat, Inc. * * See COPYING.LIB for the License of this software * @@ -106,27 +106,36 @@ virtTestRun(const char *title, int nloops, int (*body)(const void *data), const return ret; } -int virtTestLoadFile(const char *name, +/* Read FILE into buffer BUF of length BUFLEN. + Upon any failure, or if FILE appears to contain more than BUFLEN bytes, + diagnose it and return -1, but don't bother trying to preserve errno. + Otherwise, return the number of bytes read (and copied into BUF). */ +int virtTestLoadFile(const char *file, char **buf, int buflen) { - FILE *fp = fopen(name, "r"); + FILE *fp = fopen(file, "r"); struct stat st; - if (!fp) + if (!fp) { + fprintf (stderr, "%s: failed to open: %s\n", file, strerror(errno)); return -1; + } if (fstat(fileno(fp), &st) < 0) { + fprintf (stderr, "%s: failed to fstat: %s\n", file, strerror(errno)); fclose(fp); return -1; } if (st.st_size > (buflen-1)) { + fprintf (stderr, "%s: larger than buffer (> %d)\n", file, buflen-1); fclose(fp); return -1; } if (st.st_size) { if (fread(*buf, st.st_size, 1, fp) != 1) { + fprintf (stderr, "%s: read failed: %s\n", file, strerror(errno)); fclose(fp); return -1; } -- cgit v1.2.3-65-gdbad