Bug 4285

Summary:	patch: does it work?
Product:	Busybox	Reporter:	Bee <200309>
Component:	Other	Assignee:	unassigned
Status:	RESOLVED WORKSFORME
Severity:	blocker	CC:	busybox-cvs
Priority:	P5
Version:	1.17.x
Target Milestone:	---
Hardware:	PC
OS:	Linux
Host:		Target:
Build:

Description Bee 2011-10-04 02:39:15 UTC

BusyBox v1.17.2
BusyBox v1.19.2
Usage: patch [OPTIONS] [ORIGFILE [PATCHFILE]]

I can not get patch (it does not do any patching) to work with the same syntax I use with:
patch 2.6.1
Copyright (C) 1988 Larry Wall
Copyright (C) 2003, 2009 Free Software Foundation, Inc.

patch -p0 -N < ../patches/7.3.$b >> ../patches.log

I tried removing the '-N' still it does not do any patching.

I see 'patch:' quite often in your change log.

Is patch working?
If yes, what is the working syntax?

Comment 1 Denys Vlasenko 2011-10-09 02:13:50 UTC

(In reply to comment #0)
> BusyBox v1.17.2
> BusyBox v1.19.2
> Usage: patch [OPTIONS] [ORIGFILE [PATCHFILE]]
> 
> I can not get patch (it does not do any patching) to work with the same syntax
> I use with:
> patch 2.6.1
> Copyright (C) 1988 Larry Wall
> Copyright (C) 2003, 2009 Free Software Foundation, Inc.
> 
> patch -p0 -N < ../patches/7.3.$b >> ../patches.log
> 
> I tried removing the '-N' still it does not do any patching.

Please attach to this bug:

* the patch file you are trying to apply
* original file(s) before patching
* .config file you used to build your busybox binary

and specify exact command line you are using.


> I see 'patch:' quite often in your change log.
> 
> Is patch working?

Not in every imaginable case.

However:

$ cd testsuite
$ ./runtest patch
PASS: patch with old_file == new_file
PASS: patch with nonexistent old_file
PASS: patch -R with nonexistent old_file
PASS: patch detects already applied hunk
PASS: patch detects already applied hunk at the EOF
PASS: patch -N ignores already applied hunk
PASS: patch FILE PATCH
PASS: patch at the beginning
PASS: patch creates new file

Apparently, at least some cases are working.