Mercurial > hg > octave-nkf > gnulib-hg
changeset 14424:7be307034349
passfd module, part 4, tweaks.
* tests/test-passfd.c: Reorder includes.
(main): Fix perror and printf calls.
author | Bruno Haible <bruno@clisp.org> |
---|---|
date | Sun, 13 Mar 2011 20:25:19 +0100 |
parents | 1d050d935509 |
children | 94b18c3c925d |
files | ChangeLog tests/test-passfd.c |
diffstat | 2 files changed, 17 insertions(+), 12 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2011-03-13 Bruno Haible <bruno@clisp.org> + + passfd module, part 4, tweaks. + * tests/test-passfd.c: Reorder includes. + (main): Fix perror and printf calls. + 2011-03-07 Bastien Roucariès <roucaries.bastien@gmail.com> passfd module, part 4.
--- a/tests/test-passfd.c +++ b/tests/test-passfd.c @@ -1,5 +1,5 @@ -/* Test of terminating the current process. - Copyright (C) 2010-2011 Free Software Foundation, Inc. +/* Test of passing file descriptors. + Copyright (C) 2011 Free Software Foundation, 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 @@ -14,18 +14,17 @@ You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/>. */ -/* Written by Bruno Haible <bruno@clisp.org>, 2010. */ +#include <config.h> -#include <config.h> +#include "passfd.h" + +#include <fcntl.h> #include <stdlib.h> #include <stdio.h> #include <unistd.h> -#include "passfd.h" #include <sys/types.h> #include <sys/socket.h> #include <sys/stat.h> -#include <fcntl.h> - #include "macros.h" @@ -57,7 +56,7 @@ pid = fork (); if (pid == -1) { - perror ("fork:"); + perror ("fork"); return 3; } if (pid == 0) @@ -65,7 +64,7 @@ ret = sendfd (pair[1], fdnull); if (ret == -1) { - perror ("sendfd:"); + perror ("sendfd"); return 64; } return 0; @@ -82,7 +81,7 @@ ret = waitpid (pid, &status, 0); if (ret == -1) { - perror ("waitpid:"); + perror ("waitpid"); return 17; } ASSERT (ret == pid); @@ -96,7 +95,7 @@ ret = WEXITSTATUS (status); if (ret != 0) { - fprintf (stderr, "Send fd fail"); + fprintf (stderr, "Send fd fail\n"); return ret; } @@ -104,7 +103,7 @@ ret == fstat (fd, &st); if (0 != ret) { - perror("fstat:"); + perror ("fstat"); return 80; } return 0;