diff options
| author | Tim Waugh <twaugh@redhat.com> | 2010-07-27 18:09:17 +0100 |
|---|---|---|
| committer | Andreas Gruenbacher <agruen@suse.de> | 2010-07-27 19:33:01 +0200 |
| commit | 94d856cfd3d58c3e01bb38fc8eea292da4f954d5 (patch) | |
| tree | ba7eff8ec39cefc29911ba3782c3914e2646e4fb | |
| parent | 24753411737ffabc17ef19681f833578d2e1fe2b (diff) | |
| download | patch-94d856cfd3d58c3e01bb38fc8eea292da4f954d5.tar.gz | |
Stop "patch --get 1" from segfaulting
* src/patch.c: Stop "patch --get 1" from segfaulting.
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | src/patch.c | 2 |
2 files changed, 5 insertions, 1 deletions
@@ -1,3 +1,7 @@ +2010-07-27 Tim Waugh <twaugh@redhat.com> + + * src/patch.c: Stops "patch --get 1" from segfaulting. + 2009-05-11 Andreas Gruenbacher <agruen@suse.de> * src/patch.c: The read-only file check was not done for ed scripts; diff --git a/src/patch.c b/src/patch.c index 9056816..baac6b0 100644 --- a/src/patch.c +++ b/src/patch.c @@ -591,7 +591,7 @@ static struct option const longopts[] = {"remove-empty-files", no_argument, NULL, 'E'}, {"force", no_argument, NULL, 'f'}, {"fuzz", required_argument, NULL, 'F'}, - {"get", no_argument, NULL, 'g'}, + {"get", required_argument, NULL, 'g'}, {"input", required_argument, NULL, 'i'}, {"ignore-whitespace", no_argument, NULL, 'l'}, #ifdef ENABLE_MERGE |