Gentoo Attachment #35016 for bug #56468

View | Details | Raw Unified
Collapse All | Expand All

(-) dvibook-orig/Dvibook/Imakefile (-17 / +8 lines)

Lines 1-24	Link Here

OBJS	=dvibook.o

#include "../Imake.Config"

SRCS	=dvibook.c

      LIBTEXROOT= ../

         BINDIR = $(TEX_BINDIR)

      LIBTEXSRC	= ../libtex

         MANDIR = $(TEX_MANDIR)

         LIBTEX	= $(LIBTEXSRC)/libtex.a

      DEPLIBTEX	= $(LIBTEX)

        DEPLIBS = $(DEPLIBTEX) XawClientDepLibs

LOCAL_LIBRARIES = $(LIBTEX)

        DEFINES = -I$(LIBTEXROOT)

FILES	=Imakefile dvibook.man Makefile.raw $(SRCS)

          FILES = Imakefile dvibook.man $(SRCS)

all: dvibook

       INCLUDES = -I$(LIBTEXROOT)

LOCAL_LIBRARIES = $(LIBTEX)

        DEPLIBS = $(DEPLIBTEX)

NormalProgramTarget(dvibook,$(OBJS),$(DEPLIBS),$(LOCAL_LIBRARIES),$(SYSLIBS))

SimpleProgramTarget(dvibook)

InstallProgram(dvibook, $(BINDIR))

InstallManPage(dvibook,$(MANDIR))

DependTarget()

TagsTarget()

tar:

tar:

	cd ../..;\

	cd ../..;\

(-) dvibook-orig/Dvitodvi/Imakefile (-17 / +8 lines)

Lines 1-24	Link Here

OBJS	=dvitodvi.o

#include "../Imake.Config"

SRCS	=dvitodvi.c

      LIBTEXROOT= ../

         BINDIR = $(TEX_BINDIR)

      LIBTEXSRC	= ../libtex

         MANDIR = $(TEX_MANDIR)

         LIBTEX	= $(LIBTEXSRC)/libtex.a

      DEPLIBTEX	= $(LIBTEX)

        DEPLIBS = $(DEPLIBTEX) XawClientDepLibs

LOCAL_LIBRARIES = $(LIBTEX)

        DEFINES = -I$(LIBTEXROOT)

FILES	=Imakefile dvitodvi.man Makefile.raw $(SRCS)

          FILES = Imakefile dvitodvi.man $(SRCS)

all: dvitodvi

       INCLUDES = -I$(LIBTEXROOT)

LOCAL_LIBRARIES = $(LIBTEX)

        DEPLIBS = $(DEPLIBTEX)

NormalProgramTarget(dvitodvi,$(OBJS),$(DEPLIBS),$(LOCAL_LIBRARIES),$(SYSLIBS))

SimpleProgramTarget(dvitodvi)

InstallProgram(dvitodvi, $(BINDIR))

InstallManPage(dvitodvi,$(MANDIR))

DependTarget()

TagsTarget()

tar:

tar:

	cd ../..;\

	cd ../..;\

(-) dvibook-orig/Imake.Config (-4 / +4 lines)

Lines 1-8	Link Here

/* * Install directories for programs not related to X */

/* * Install directories for programs not related to X */

TEX_BINDIR = /srl/TeX/bin

TEX_BINDIR = /usr/bin

TEX_MANDIR = /srl/TeX/man/man1

TEX_MANDIR = /usr/share/man/man1

TEX_INPUTS = /srl/TeX/lib/tex/inputs

MANSUFFIX = 1

/*

/*

 *	Set `FONTDESC' to the location of your fontdesc file, unquoted.

 *	Set `FONTDESC' to the location of your fontdesc file, unquoted.

Lines 189-195	Link Here

/*

/*

 * 	 Undefine GETOP if your loader complains about multiple ref's.

 * 	 Undefine GETOP if your loader complains about multiple ref's.

*/

*/

#if 1

#if 0

  GETOPT=getopt.o

  GETOPT=getopt.o

#else

#else

  GETOPT=

  GETOPT=

(-) dvibook-orig/libtex/error.c (-23 / +7 lines)

Lines 21-27	Link Here

#include "types.h"		/* for HAVE_VPRINTF */

#include "types.h"		/* for HAVE_VPRINTF */

#include "error.h"

#include "error.h"

#include <stdio.h>

#include <stdio.h>

#include <varargs.h>

#include <stdarg.h>

#if defined(lint) && !defined(LINT_ANYWAY)

#if defined(lint) && !defined(LINT_ANYWAY)

Lines 34-45	Link Here

/* VARARGS1 ARGSUSED */

/* VARARGS1 ARGSUSED */

void panic(fmt) char *fmt; { exit(1); /* NOTREACHED */ }

void panic(fmt) char *fmt; { exit(1); /* NOTREACHED */ }

#else lint

#else /* lint */

extern char *ProgName;		/* program name from argv[0] */

extern char *ProgName;		/* program name from argv[0] */

extern int errno;		/* Unix system-call error */

extern char *sys_errlist[];	/* table of error number => string */

extern int sys_nerr;		/* size of table */

static FILE *trap_file;		/* error diversion file, if any */

static FILE *trap_file;		/* error diversion file, if any */

static void (*trap_fn)();	/* trap function */

static void (*trap_fn)();	/* trap function */

Lines 143-152	Link Here

	(void) _doprnt(fmt, l, fp);

	(void) _doprnt(fmt, l, fp);

#endif

#endif

	if (e) {

	if (e) {

		if (e < sys_nerr)

		(void) fprintf(fp, ": %s", strerror(e));

			(void) fprintf(fp, ": %s", sys_errlist[e]);

		else

			(void) fprintf(fp, ": Unknown error code %d", e);

	(void) putc('\n', fp);

	(void) putc('\n', fp);

	(void) fflush(fp);

	(void) fflush(fp);

Lines 160-177	Link Here

 * Print an error message and optionally quit.

 * Print an error message and optionally quit.

*/

*/

void

void

error(va_alist)

error(int quit, int e, const char *fmt, ...)

	va_dcl

	va_list l;

	va_list l;

	int quit, e;

	char *fmt;

	va_start(l);

	va_start(l, fmt);

	quit = va_arg(l, int);

	if ((e = va_arg(l, int)) < 0)

		e = errno;

	fmt = va_arg(l, char *);

	verror(quit, (char *)NULL, fmt, l, e);

	verror(quit, (char *)NULL, fmt, l, e);

	va_end(l);

	va_end(l);

Lines 180-194	Link Here

 * Panic (print to stderr and abort).

 * Panic (print to stderr and abort).

*/

*/

void

void

panic(va_alist)

panic(const char *fmt, ...)

	va_dcl

	va_list l;

	va_list l;

	char *fmt;

	SetErrorTrap((void (*)())NULL);	/* shut down any trap */

	SetErrorTrap((void (*)())NULL);	/* shut down any trap */

	va_start(l);

	va_start(l, fmt);

	fmt = va_arg(l, char *);

	verror(0, "panic: ", fmt, l, 0);

	verror(0, "panic: ", fmt, l, 0);

	va_end(l);

	va_end(l);

	abort();

	abort();

(-) dvibook-orig/libtex/error.h (-2 / +2 lines)

Lines 8-14	Link Here

/*

/*

 * Errors.

 * Errors.

*/

*/

void	error(/* int quit, int e, char *fmt, ... */);

void	error(int quit, int e, const char *fmt, ...);

void	panic(/* char *fmt, ... */);

void	panic(const char *fmt, ...);

void	SetErrorTrap(/* void (*fn)(int quit, char *text) */);

void	SetErrorTrap(/* void (*fn)(int quit, char *text) */);

(-) dvibook-orig/libtex/gripes0.c (-2 / +1 lines)

Lines 14-25	Link Here

*/

*/

#include <stdio.h>

#include <stdio.h>

#include <errno.h>

#include "types.h"

#include "types.h"

#include "error.h"

#include "error.h"

#include "gripes.h"

#include "gripes.h"

extern	errno;

/*

/*

 * Cannot allocate memory.

 * Cannot allocate memory.

*/

*/

(-) dvibook-orig/libtex/sdecode.c (-7 / +6 lines)

Lines 10-16	Link Here

#endif

#endif

#include <stdio.h>

#include <stdio.h>

#include <varargs.h>

#include <stdarg.h>

#include "types.h"

#include "types.h"

#include "sdecode.h"

#include "sdecode.h"

Lines 21-27	Link Here

static int sdset;		/* flag says whether cclass[] set up */

static int sdset;		/* flag says whether cclass[] set up */

static void args(), badarg();

static void args(), badarg();

static int scan(), scan_i(), scan_d();

static int scan_i(), scan_d();

extern char *strsave();

extern char *strsave();

Lines 80-85	Link Here

	int	di_bkw;		/* true iff keyword is in static buffer */

	int	di_bkw;		/* true iff keyword is in static buffer */

};

};

static int scan(register struct decode_info *di, ...);

/*

/*

 * `Edit' the text in the buffer in-place.

 * `Edit' the text in the buffer in-place.

 * Return the count of characters resulting from the edit (e.g.,

 * Return the count of characters resulting from the edit (e.g.,

Lines 553-569	Link Here

static int

static int

scan(va_alist)

scan(register struct decode_info *di, ...)

	va_dcl

	register struct decode_info *di;

	register char *fmt;

	register char *fmt;

	register int c;

	register int c;

	char **fmtp;

	char **fmtp;

	va_list ap;

	va_list ap;

	va_start(ap);

	va_start(ap, di);

	di = va_arg(ap, struct decode_info *);

	fmtp = va_arg(ap, char **);

	fmtp = va_arg(ap, char **);

	fmt = *fmtp;

	fmt = *fmtp;

	while ((c = *fmt++) != 0) {

	while ((c = *fmt++) != 0) {

Attachment #35016: dvibook-19940319.patch for bug #56468