folkslinux
/
rpm
mirror of https://github.com/rpm-software-management/rpm.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Save and restore 1st char of next line in multiline expansion correctly. 

CVS patchset: 3191
CVS date: 1999/07/20 20:48:29
This commit is contained in:
jbj 1999-07-20 20:48:29 +00:00
parent c50704544b
commit 1132ce76b9
2 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
build/parseSpec.c
View File

@ -105,6 +105,11 @@ static int copyNextLine(Spec spec, OFI_t *ofi, int strip)
char *last;
char ch;
/* Restore 1st char in (possible) next line */
if (spec->nextpeekc) {
*spec->nextline = spec->nextpeekc;
spec->nextpeekc = '\0';
}
/* Expand next line from file into line buffer */
if (!(spec->nextline && *spec->nextline)) {
char *from, *to;
@ -125,14 +130,14 @@ static int copyNextLine(Spec spec, OFI_t *ofi, int strip)
/* Find next line in expanded line buffer */
spec->line = last = spec->nextline;
if (spec->line != spec->lbuf)
*spec->line = spec->nextpeekc;
ch = ' ';
while (*spec->nextline && ch != '\n') {
ch = *spec->nextline++;
if (!isspace(ch))
last = spec->nextline;
}
/* Save 1st char of next line in order to terminate current line. */
if (*spec->nextline) {
spec->nextpeekc = *spec->nextline;
*spec->nextline = '\0';

22
po/rpm.pot
View File

@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"POT-Creation-Date: 1999-07-20 14:49-0400\n"
"POT-Creation-Date: 1999-07-20 16:37-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@ -1861,49 +1861,49 @@ msgstr ""
msgid "line %d: Second %s"
msgstr ""
#: ../build/parseSpec.c:120
#: ../build/parseSpec.c:125
#, c-format
msgid "line %d: %s"
msgstr ""
#: ../build/parseSpec.c:166
#: ../build/parseSpec.c:172
#, c-format
msgid "Unable to open: %s\n"
msgstr ""
#: ../build/parseSpec.c:178
#: ../build/parseSpec.c:184
msgid "Unclosed %%if"
msgstr ""
#: ../build/parseSpec.c:237
#: ../build/parseSpec.c:243
#, c-format
msgid "%s:%d: parseExpressionBoolean returns %d"
msgstr ""
#. Got an else with no %if !
#: ../build/parseSpec.c:245
#: ../build/parseSpec.c:251
msgid "%s:%d: Got a %%else with no if"
msgstr ""
#. Got an end with no %if !
#: ../build/parseSpec.c:256
#: ../build/parseSpec.c:262
msgid "%s:%d: Got a %%endif with no if"
msgstr ""
#: ../build/parseSpec.c:270 ../build/parseSpec.c:279
#: ../build/parseSpec.c:276 ../build/parseSpec.c:285
msgid "malformed %%include statement"
msgstr ""
#: ../build/parseSpec.c:360
#: ../build/parseSpec.c:366
#, c-format
msgid "Timecheck value must be an integer: %s"
msgstr ""
#: ../build/parseSpec.c:443
#: ../build/parseSpec.c:449
msgid "No buildable architectures"
msgstr ""
#: ../build/parseSpec.c:488
#: ../build/parseSpec.c:494
msgid "Package has no %%description: %s"
msgstr ""