diff options
author | Saul Wold <sgw@linux.intel.com> | 2012-12-13 19:01:35 -0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-12-19 17:55:03 +0000 |
commit | d0505b7c01ac6a5fe4e142b4c2675af553247b29 (patch) | |
tree | 0761e8ea3b1023e11c1c37ba1263e54c5acffb3c /meta/recipes-extended/man/man/man-1.5m2-multiple.patch | |
parent | 3cdf7e2001212a849f90722968dd53d97d7e2061 (diff) | |
download | poky-d0505b7c01ac6a5fe4e142b4c2675af553247b29.tar.gz |
man: Update to 1.6g
Rebase some patches
(From OE-Core rev: 4cb22ea0beb952a5d70f83aaac415b7f2ecf3fd5)
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended/man/man/man-1.5m2-multiple.patch')
-rw-r--r-- | meta/recipes-extended/man/man/man-1.5m2-multiple.patch | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/meta/recipes-extended/man/man/man-1.5m2-multiple.patch b/meta/recipes-extended/man/man/man-1.5m2-multiple.patch new file mode 100644 index 0000000000..ec06ab7833 --- /dev/null +++ b/meta/recipes-extended/man/man/man-1.5m2-multiple.patch | |||
@@ -0,0 +1,22 @@ | |||
1 | Upstream-Status: Pending | ||
2 | |||
3 | Signed-off-by: Scott Garman <scott.a.garman@intel.com> | ||
4 | |||
5 | --- man-1.5m2/src/manfile.c_multiple 2006-12-08 23:42:17.000000000 +0100 | ||
6 | +++ man-1.5m2/src/manfile.c 2006-12-09 00:00:01.000000000 +0100 | ||
7 | @@ -25,9 +25,12 @@ | ||
8 | |||
9 | if (a) { | ||
10 | if (*head) { | ||
11 | - p = *head; | ||
12 | - while(p->next) | ||
13 | - p = p->next; | ||
14 | + for (p = *head; p->next; p = p->next) { | ||
15 | + if(!strcmp (p->filename, a->filename)) | ||
16 | + return; | ||
17 | + } | ||
18 | + if(!strcmp (p->filename, a->filename)) | ||
19 | + return; | ||
20 | p->next = a; | ||
21 | } else | ||
22 | *head = a; | ||