mirror of
https://github.com/freebsd/freebsd-src.git
synced 2026-10-31 04:45:39 +01:00
Alan Somers
c0c93371da
r311572: Fix file descriptor leaks in cmp(1) Also, add a few test cases Reported by: Coverity CID: 271624 275338 Reviewed by: ngie MFC after: 4 weeks Sponsored by: Spectra Logic Corp Differential Revision: https://reviews.freebsd.org/D9074 r311895: Fix memory leaks during "tail -r" of an irregular file * Rewrite r_buf to use standard tail queues instead of a hand-rolled circular linked list. Free dynamic allocations when done. * Remove an optimization for the case where the file is a multiple of 128KB in size and there is a scarcity of memory. * Add ATF tests for "tail -r" and its variants. Reported by: Valgrind Reviewed by: ngie MFC after: 4 weeks Sponsored by: Spectra Logic Corp Differential Revision: https://reviews.freebsd.org/D9067 r311928: Fix build of usr.bin/tail with GCC Submitted by: pluknet Reported by: pluknet MFC after: 27 days X-MFC-with: 311895 Sponsored by: Spectra Logic Corp r311985: Fix uninitialized variable CIDs in route6d The variables in question are actually return arguments, but it's still good form to initialize them. Reported by: Coverity CID: 979679 979680 MFC after: 4 weeks Sponsored by: Spectra Logic Corp r312395: Fix several Coverity CIDs in devd CID 1362055, 1362054: File descriptor leaks during shutdown CID 1362013: Potential null-termination fail with long network device names CID 1362097: Uncaught exception during memory pressure CID 1362017, 1362016: Unchecked errors, possibly resulting in weird behavior if two devd instances start at the same time. CID 1362015: Unchecked error that will probably never fail Reported by: Coverity CID: 1362055 1362054 1362013 1362097 1362017 1362016 1362015 MFC after: 4 weeks Sponsored by: Spectra Logic Corp r312417: Fix build of devd with GCC 4.2 Reported by: olivier Pointy-hat-to: asomers MFC after: 27 days X-MFC-with: 312395 Sponsored by: Spectra Logic Corp
107 lines
2.9 KiB
C
107 lines
2.9 KiB
C
/*-
|
|
* Copyright (c) 1991, 1993, 1994
|
|
* The Regents of the University of California. All rights reserved.
|
|
*
|
|
* Redistribution and use in source and binary forms, with or without
|
|
* modification, are permitted provided that the following conditions
|
|
* are met:
|
|
* 1. Redistributions of source code must retain the above copyright
|
|
* notice, this list of conditions and the following disclaimer.
|
|
* 2. Redistributions in binary form must reproduce the above copyright
|
|
* notice, this list of conditions and the following disclaimer in the
|
|
* documentation and/or other materials provided with the distribution.
|
|
* 4. Neither the name of the University nor the names of its contributors
|
|
* may be used to endorse or promote products derived from this software
|
|
* without specific prior written permission.
|
|
*
|
|
* THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
|
|
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
|
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
|
* ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
|
|
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
|
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
|
|
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
|
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
|
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
|
|
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
|
* SUCH DAMAGE.
|
|
*/
|
|
|
|
#if 0
|
|
#ifndef lint
|
|
static char sccsid[] = "@(#)special.c 8.3 (Berkeley) 4/2/94";
|
|
#endif
|
|
#endif
|
|
|
|
#include <sys/cdefs.h>
|
|
__FBSDID("$FreeBSD$");
|
|
|
|
#include <sys/types.h>
|
|
|
|
#include <err.h>
|
|
#include <stdlib.h>
|
|
#include <stdio.h>
|
|
|
|
#include "extern.h"
|
|
|
|
void
|
|
c_special(int fd1, const char *file1, off_t skip1,
|
|
int fd2, const char *file2, off_t skip2)
|
|
{
|
|
int ch1, ch2;
|
|
off_t byte, line;
|
|
FILE *fp1, *fp2;
|
|
int dfound;
|
|
|
|
if ((fp1 = fdopen(fd1, "r")) == NULL)
|
|
err(ERR_EXIT, "%s", file1);
|
|
if ((fp2 = fdopen(fd2, "r")) == NULL)
|
|
err(ERR_EXIT, "%s", file2);
|
|
|
|
dfound = 0;
|
|
while (skip1--)
|
|
if (getc(fp1) == EOF)
|
|
goto eof;
|
|
while (skip2--)
|
|
if (getc(fp2) == EOF)
|
|
goto eof;
|
|
|
|
for (byte = line = 1;; ++byte) {
|
|
ch1 = getc(fp1);
|
|
ch2 = getc(fp2);
|
|
if (ch1 == EOF || ch2 == EOF)
|
|
break;
|
|
if (ch1 != ch2) {
|
|
if (xflag) {
|
|
dfound = 1;
|
|
(void)printf("%08llx %02x %02x\n",
|
|
(long long)byte - 1, ch1, ch2);
|
|
} else if (lflag) {
|
|
dfound = 1;
|
|
(void)printf("%6lld %3o %3o\n",
|
|
(long long)byte, ch1, ch2);
|
|
} else {
|
|
diffmsg(file1, file2, byte, line);
|
|
/* NOTREACHED */
|
|
}
|
|
}
|
|
if (ch1 == '\n')
|
|
++line;
|
|
}
|
|
|
|
eof: if (ferror(fp1))
|
|
err(ERR_EXIT, "%s", file1);
|
|
if (ferror(fp2))
|
|
err(ERR_EXIT, "%s", file2);
|
|
if (feof(fp1)) {
|
|
if (!feof(fp2))
|
|
eofmsg(file1);
|
|
} else
|
|
if (feof(fp2))
|
|
eofmsg(file2);
|
|
fclose(fp2);
|
|
fclose(fp1);
|
|
if (dfound)
|
|
exit(DIFF_EXIT);
|
|
}
|