8206faf91beb5c68db79c5d919b6ce16f5d398cd
[openwrt-10.03/.git] / package / busybox / patches / 523-conffiles_fix.patch
1 Index: busybox-1.8.2/archival/libipkg/pkg.c
2 ===================================================================
3 --- busybox-1.8.2.orig/archival/libipkg/pkg.c   2008-01-02 21:53:12.616453611 +0100
4 +++ busybox-1.8.2/archival/libipkg/pkg.c        2008-01-02 21:54:41.462489150 +0100
5 @@ -587,13 +587,14 @@
6                   return NULL;
7                 }
8                 temp[0]='\0';
9 -               strncpy(temp, "Conffiles:\n", 12);
10 +               strncpy(temp, "Conffiles: ", 12);
11                for (iter = pkg->conffiles.head; iter; iter = iter->next) {
12                     if (iter->data->name && iter->data->value) {
13 -                         snprintf(line_str, LINE_LEN, "%s %s\n", iter->data->name, iter->data->value);
14 +                         snprintf(line_str, LINE_LEN, "%s %s", iter->data->name, iter->data->value);
15                           strncat(temp, line_str, strlen(line_str));           
16                     }
17                }
18 +              strcat(temp, "\n");
19           } else if (strcasecmp(field, "Conflicts") == 0) {
20                int i;
21