SvarDOSSvarDOS Packages

BlueGreycalmElegant

Català-Valencià – Catalan中文 – Chinese (Simplified)中文 – Chinese (Traditional)Česky – CzechDansk – DanishNederlands – DutchEnglish – EnglishSuomi – FinnishFrançais – FrenchDeutsch – Germanעברית – Hebrewहिंदी – HindiMagyar – HungarianBahasa Indonesia – IndonesianItaliano – Italian日本語 – Japanese한국어 – KoreanМакедонски – Macedonianमराठी – MarathiNorsk – NorwegianPolski – PolishPortuguês – PortuguesePortuguês – Portuguese (Brazil)Русский – RussianSlovenčina – SlovakSlovenščina – SlovenianEspañol – SpanishSvenska – SwedishTürkçe – TurkishУкраїнська – UkrainianOëzbekcha – Uzbek

Compare Revisions

• This comparison shows the changes necessary to convert path

  → /pkginst/ @ 261

  → /pkginst/ @ 262

  ↔ Reverse comparison

• Compare Path:	Rev

  With Path:	Rev

Ignore whitespace Rev 261 → Rev 262

/pkginst/parsecmd.c
File deleted

/pkginst/parsecmd.h
File deleted

/pkginst/Makefile
9,7 → 9,7
all: pkginst.exe
pkginst.exe: kitten.obj main.obj crc32.obj fileexst.obj helpers.obj inf.obj kprintf.obj libunzip.obj loadconf.obj lsm.obj parsecmd.obj pkginst.obj pkgrem.obj trim.obj showinst.obj
pkginst.exe: kitten.obj main.obj crc32.obj fileexst.obj helpers.obj inf.obj kprintf.obj libunzip.obj loadconf.obj lsm.obj pkginst.obj pkgrem.obj trim.obj showinst.obj
wcl $(LDFLAGS) $(LIBS) *.obj
kitten.obj: kitten\kitten.c
42,9 → 42,6
lsm.obj: lsm.c
wcc $(CFLAGS) lsm.c
parsecmd.obj: parsecmd.c
wcc $(CFLAGS) parsecmd.c
pkginst.obj: pkginst.c
wcc $(CFLAGS) pkginst.c

/pkginst/loadconf.c
10,11 → 10,10
#include <string.h> /* strcasecmp() */
#include <stdlib.h> /* malloc(), free() */
#include "pkginst.h" /* PKGINST_SKIPLINKS... */
#include "helpers.h" /* slash2backslash(), removeDoubleBackslashes()... */
#include "kprintf.h"
#include "loadconf.h"
#include "parsecmd.h"
void freeconf(struct customdirs **dirlist) {
122,16 → 121,23
/* printf("token='%s' ; value = '%s'\n", token, value); */
if (strcasecmp(token, "DIR") == 0) { /* custom directory entry */
char *argv[2];
if (parsecmd(value, argv, 2) != 2) {
char *location = NULL;
int i;
/* find nearer space */
for (i = 0; (value[i] != ' ') && (value[i] != 0); i++);
if (value[i] == 0) {
kitten_printf(7, 11, "Warning: Invalid 'DIR' directive found at line #%d", nline);
puts("");
continue;
}
value[i] = 0;
location = value + i + 1;
/* add the entry to the list */
slash2backslash(argv[1]);
removeDoubleBackslashes(argv[1]);
if (argv[1][strlen(argv[1]) - 1] != '\\') strcat(argv[1], "\\"); /* make sure to end dirs with a backslash */
if (addnewdir(dirlist, argv[0], argv[1]) != 0) {
slash2backslash(location);
removeDoubleBackslashes(location);
if (location[strlen(location) - 1] != '\\') strcat(location, "\\"); /* make sure to end dirs with a backslash */
if (addnewdir(dirlist, value, location) != 0) {
kitten_printf(2, 14, "Out of memory! (%s)", "addnewdir");
puts("");
freeconf(dirlist);