]>
Commit | Line | Data |
---|---|---|
1 | From b50508742035812f8ae8671eedc6623fac53f51d Mon Sep 17 00:00:00 2001 | |
2 | From: Jim Meyering <jim@meyering.net> | |
3 | Date: Thu, 22 Jun 2006 12:50:32 +0000 | |
4 | Subject: [PATCH] * src/tee.c (tee_files): Rename from tee, to avoid conflict with | |
5 | the function in glibc's <fcntl.h>. Reported by Andreas Schwab. | |
6 | ||
7 | --- | |
8 | src/tee.c | 8 ++++---- | |
9 | 1 file changed, 4 insertions(+), 4 deletions(-) | |
10 | ||
11 | diff --git a/src/tee.c b/src/tee.c | |
12 | index f99642d..f612181 100644 | |
13 | --- a/src/tee.c | |
14 | +++ b/src/tee.c | |
15 | @@ -1,5 +1,5 @@ | |
16 | /* tee - read from standard input and write to standard output and files. | |
17 | - Copyright (C) 85,1990-2005 Free Software Foundation, Inc. | |
18 | + Copyright (C) 85,1990-2006 Free Software Foundation, Inc. | |
19 | ||
20 | This program is free software; you can redistribute it and/or modify | |
21 | it under the terms of the GNU General Public License as published by | |
22 | @@ -31,7 +31,7 @@ | |
23 | ||
24 | #define AUTHORS "Mike Parker", "Richard M. Stallman", "David MacKenzie" | |
25 | ||
26 | -static bool tee (int nfiles, const char **files); | |
27 | +static bool tee_files (int nfiles, const char **files); | |
28 | ||
29 | /* If true, append to output files rather than truncating them. */ | |
30 | static bool append; | |
31 | @@ -121,7 +121,7 @@ main (int argc, char **argv) | |
32 | /* Do *not* warn if tee is given no file arguments. | |
33 | POSIX requires that it work when given no arguments. */ | |
34 | ||
35 | - ok = tee (argc - optind, (const char **) &argv[optind]); | |
36 | + ok = tee_files (argc - optind, (const char **) &argv[optind]); | |
37 | if (close (STDIN_FILENO) != 0) | |
38 | error (EXIT_FAILURE, errno, _("standard input")); | |
39 | ||
40 | @@ -133,7 +133,7 @@ main (int argc, char **argv) | |
41 | Return true if successful. */ | |
42 | ||
43 | static bool | |
44 | -tee (int nfiles, const char **files) | |
45 | +tee_files (int nfiles, const char **files) | |
46 | { | |
47 | FILE **descriptors; | |
48 | char buffer[BUFSIZ]; | |
49 | -- | |
50 | 1.7.2.5 | |
51 |