d8127f841f
This is the combination of two NetBSD patches committed by Christos Zoulas, based on the findings and Bitrig patch by Martin Natano. The NetBSD log messages read: From Martin Natano @bitrig: Use execve(2) instead of system to apply patches that require rcs command execution instead system(3) to avoid malicious filenames in patches causing bad things to happen. In the process, lose SCCS support. It is not like we are shipping sccs commands for that to work. And: Use absolute paths for RCS commands (Martin Natano) Change-Id: Id44bd59a5a6bc6cd95d1e1fae468bd718cfff2db
123 lines
3.3 KiB
C
123 lines
3.3 KiB
C
/*
|
|
* $OpenBSD: common.h,v 1.26 2006/03/11 19:41:30 otto Exp $
|
|
* $DragonFly: src/usr.bin/patch/common.h,v 1.5 2008/08/10 23:50:12 joerg Exp $
|
|
* $NetBSD: common.h,v 1.19 2008/09/19 18:33:34 joerg Exp $
|
|
*/
|
|
|
|
/*
|
|
* patch - a program to apply diffs to original files
|
|
*
|
|
* Copyright 1986, Larry Wall
|
|
*
|
|
* Redistribution and use in source and binary forms, with or without
|
|
* modification, are permitted provided that the following condition is met:
|
|
* 1. Redistributions of source code must retain the above copyright notice,
|
|
* this condition and the following disclaimer.
|
|
*
|
|
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR 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 AUTHOR 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.
|
|
*
|
|
* -C option added in 1998, original code by Marc Espie, based on FreeBSD
|
|
* behaviour
|
|
*/
|
|
|
|
#include <sys/types.h>
|
|
|
|
#include <stdbool.h>
|
|
#include <stdint.h>
|
|
|
|
#define DEBUGGING
|
|
|
|
/* constants */
|
|
|
|
#define MAXHUNKSIZE 100000 /* is this enough lines? */
|
|
#define INITHUNKMAX 125 /* initial dynamic allocation size */
|
|
#define MAXLINELEN 8192
|
|
#define BUFFERSIZE 1024
|
|
|
|
#define SCCSPREFIX "s."
|
|
#define GET "get -e %s"
|
|
#define SCCSDIFF "get -p %s | diff - %s >/dev/null"
|
|
|
|
#define RCSSUFFIX ",v"
|
|
#define CHECKOUT "/usr/bin/co"
|
|
#define RCSDIFF "/usr/bin/rcsdiff"
|
|
|
|
#define ORIGEXT ".orig"
|
|
#define REJEXT ".rej"
|
|
|
|
/* handy definitions */
|
|
|
|
#define strNE(s1,s2) (strcmp(s1, s2))
|
|
#define strEQ(s1,s2) (!strcmp(s1, s2))
|
|
#define strnNE(s1,s2,l) (strncmp(s1, s2, l))
|
|
#define strnEQ(s1,s2,l) (!strncmp(s1, s2, l))
|
|
|
|
/* typedefs */
|
|
|
|
typedef long LINENUM; /* must be signed */
|
|
|
|
/* globals */
|
|
|
|
extern mode_t filemode;
|
|
|
|
extern char buf[MAXLINELEN];/* general purpose buffer */
|
|
extern size_t buf_len;
|
|
|
|
extern bool using_plan_a; /* try to keep everything in memory */
|
|
extern bool out_of_mem; /* ran out of memory in plan a */
|
|
|
|
#define MAXFILEC 2
|
|
|
|
extern char *filearg[MAXFILEC];
|
|
extern bool ok_to_create_file;
|
|
extern char *outname;
|
|
extern char *origprae;
|
|
|
|
extern char *TMPOUTNAME;
|
|
extern char *TMPINNAME;
|
|
extern char *TMPREJNAME;
|
|
extern char *TMPPATNAME;
|
|
extern bool toutkeep;
|
|
extern bool trejkeep;
|
|
|
|
#ifdef DEBUGGING
|
|
extern int debug;
|
|
#endif
|
|
|
|
extern bool force;
|
|
extern bool batch;
|
|
extern bool verbose;
|
|
extern bool reverse;
|
|
extern bool noreverse;
|
|
extern bool skip_rest_of_patch;
|
|
extern int strippath;
|
|
extern bool canonicalize;
|
|
/* TRUE if -C was specified on command line. */
|
|
extern bool check_only;
|
|
extern bool warn_on_invalid_line;
|
|
extern bool last_line_missing_eol;
|
|
|
|
|
|
#define CONTEXT_DIFF 1
|
|
#define NORMAL_DIFF 2
|
|
#define ED_DIFF 3
|
|
#define NEW_CONTEXT_DIFF 4
|
|
#define UNI_DIFF 5
|
|
|
|
extern int diff_type;
|
|
extern char *revision; /* prerequisite revision, if any */
|
|
extern LINENUM input_lines; /* how long is input file in lines */
|
|
|
|
extern int posix;
|
|
|