removed text and help file backends; added some usage crap and removed the help command line optin(who needs that)

git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@1542 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
rainwater 2002-11-01 21:52:36 +00:00
parent ef17957fff
commit 048c27836c
23 changed files with 7533 additions and 10037 deletions

View file

@ -9,33 +9,28 @@
#ifdef LOGALLOC
#define LOGPARAMS char *file, int line,
static FILE *logallocfp = NULL;
static int logline = 2; /* off by 1: `null pointer is' */
static void
loginc (void)
static int logline = 2; /* off by 1: `null pointer is' */
static void loginc(void)
{
}
static void
logallocinit (void)
static void logallocinit(void)
{
if (!logallocfp)
{
logallocfp = fopen ("malloc.log", "w");
if (!logallocfp)
{
fprintf (stderr, "panic: unable to open malloc.log\n");
exit (10);
}
setvbuf (logallocfp, NULL, _IOLBF, BUFSIZ);
fprintf (logallocfp, "null pointer is %p\n", NULL);
if (!logallocfp) {
logallocfp = fopen("malloc.log", "w");
if (!logallocfp) {
fprintf(stderr, "panic: unable to open malloc.log\n");
exit(10);
}
setvbuf(logallocfp, NULL, _IOLBF, BUFSIZ);
fprintf(logallocfp, "null pointer is %p\n", NULL);
}
}
static void
logprintf (char *fmt, ...)
static void logprintf(char *fmt, ...)
{
va_list ap;
va_start (ap, fmt);
vfprintf (logallocfp, fmt, ap);
va_end (ap);
va_list ap;
va_start(ap, fmt);
vfprintf(logallocfp, fmt, ap);
va_end(ap);
}
#define LOGPRINT(x) ( logallocinit(), logprintf x )
@ -50,124 +45,110 @@ logprintf (char *fmt, ...)
* smalloc should guarantee to return a useful pointer - Halibut
* can do nothing except die when it's out of memory anyway.
*/
void *(smalloc) (LOGPARAMS int size)
{
void *p;
LOGINC;
LOGPRINT (("%s %d malloc(%ld)", file, line, (long) size));
p = malloc (size);
if (!p)
fatal (err_nomemory);
LOGPRINT ((" returns %p\n", p));
return p;
void *(smalloc) (LOGPARAMS int size) {
void *p;
LOGINC;
LOGPRINT(("%s %d malloc(%ld)", file, line, (long) size));
p = malloc(size);
if (!p)
fatal(err_nomemory);
LOGPRINT((" returns %p\n", p));
return p;
}
/*
* sfree should guaranteeably deal gracefully with freeing NULL
*/
void (sfree) (LOGPARAMS void *p)
{
if (p)
{
LOGINC;
LOGPRINT (("%s %d free(%p)\n", file, line, p));
free (p);
void (sfree) (LOGPARAMS void *p) {
if (p) {
LOGINC;
LOGPRINT(("%s %d free(%p)\n", file, line, p));
free(p);
}
}
/*
* srealloc should guaranteeably be able to realloc NULL
*/
void *(srealloc) (LOGPARAMS void *p, int size)
{
void *q;
if (p)
{
LOGINC;
LOGPRINT (("%s %d realloc(%p,%ld)", file, line, p, (long) size));
q = realloc (p, size);
LOGPRINT ((" returns %p\n", q));
void *(srealloc) (LOGPARAMS void *p, int size) {
void *q;
if (p) {
LOGINC;
LOGPRINT(("%s %d realloc(%p,%ld)", file, line, p, (long) size));
q = realloc(p, size);
LOGPRINT((" returns %p\n", q));
} else {
LOGINC;
LOGPRINT(("%s %d malloc(%ld)", file, line, (long) size));
q = malloc(size);
LOGPRINT((" returns %p\n", q));
}
else
{
LOGINC;
LOGPRINT (("%s %d malloc(%ld)", file, line, (long) size));
q = malloc (size);
LOGPRINT ((" returns %p\n", q));
}
if (!q)
fatal (err_nomemory);
return q;
if (!q)
fatal(err_nomemory);
return q;
}
/*
* dupstr is like strdup, but with the never-return-NULL property
* of smalloc (and also reliably defined in all environments :-)
*/
char *
dupstr (char *s)
char *dupstr(char *s)
{
char *r = smalloc (1 + strlen (s));
strcpy (r, s);
return r;
char *r = smalloc(1 + strlen(s));
strcpy(r, s);
return r;
}
/*
* Duplicate a linked list of words
*/
word *
dup_word_list (word * w)
word *dup_word_list(word * w)
{
word *head, **eptr = &head;
word *head, **eptr = &head;
while (w)
{
word *newwd = mknew (word);
*newwd = *w; /* structure copy */
newwd->text = ustrdup (w->text);
if (w->alt)
newwd->alt = dup_word_list (w->alt);
*eptr = newwd;
newwd->next = NULL;
eptr = &newwd->next;
while (w) {
word *newwd = mknew(word);
*newwd = *w; /* structure copy */
newwd->text = ustrdup(w->text);
if (w->alt)
newwd->alt = dup_word_list(w->alt);
*eptr = newwd;
newwd->next = NULL;
eptr = &newwd->next;
w = w->next;
w = w->next;
}
return head;
return head;
}
/*
* Free a linked list of words
*/
void
free_word_list (word * w)
void free_word_list(word * w)
{
word *t;
while (w)
{
t = w;
w = w->next;
sfree (t->text);
if (t->alt)
free_word_list (t->alt);
sfree (t);
word *t;
while (w) {
t = w;
w = w->next;
sfree(t->text);
if (t->alt)
free_word_list(t->alt);
sfree(t);
}
}
/*
* Free a linked list of paragraphs
*/
void
free_para_list (paragraph * p)
void free_para_list(paragraph * p)
{
paragraph *t;
while (p)
{
t = p;
p = p->next;
sfree (t->keyword);
free_word_list (t->words);
sfree (t);
paragraph *t;
while (p) {
t = p;
p = p->next;
sfree(t->keyword);
free_word_list(t->words);
sfree(t);
}
}