diff -C 2 -r ../otools/tools-2.16/tools/Makefile tools/Makefile
*** ../otools/tools-2.16/tools/Makefile	Wed Aug  3 04:21:55 1994
--- tools/Makefile	Wed Feb 15 03:06:24 1995
***************
*** 13,17 ****
  HOST_CC=gcc
  #CFLAGS = -g -O  -Wall -I.
! CFLAGS = -g -O2 -Wall -I.
  
  include Makerules
--- 13,17 ----
  HOST_CC=gcc
  #CFLAGS = -g -O  -Wall -I.
! CFLAGS = -g -Wall -I.
  
  include Makerules
diff -C 2 -r ../otools/tools-2.16/tools/jumpas.c tools/jumpas.c
*** ../otools/tools-2.16/tools/jumpas.c	Mon Aug 15 22:56:48 1994
--- tools/jumpas.c	Wed Feb 15 11:14:53 1995
***************
*** 66,72 ****
  
  int mode = UNDEFINED;
! char var[256] = {0,};
! char var1[256] = {0,};
! char scra[256] = {0,};
  
  extern int fixassy();
--- 66,72 ----
  
  int mode = UNDEFINED;
! char var[1024] = {0,};
! char var1[1024] = {0,};
! char scra[1024] = {0,};
  
  extern int fixassy();
***************
*** 109,113 ****
    if (!logfile)
      {
!       char filename[256];
        strcpy(filename, filedir);
        strcat(filename, JUMP_LOG);
--- 109,113 ----
    if (!logfile)
      {
!       char filename[1024];
        strcpy(filename, filedir);
        strcat(filename, JUMP_LOG);
***************
*** 203,208 ****
  	  if(*cptr == '"' && (cptr[-1] != '\\' || (cptr[-2] == '\\'))) {
  	    cptr++;
! 	    while(*cptr != '"' || (cptr[-1] == '\\' && cptr[-2] != '\\'))
  		  cptr++;
  	    cptr++;
  	    };
--- 203,210 ----
  	  if(*cptr == '"' && (cptr[-1] != '\\' || (cptr[-2] == '\\'))) {
  	    cptr++;
! 	    while(*cptr != '"') {
! 	      if (*cptr == '\\') cptr++;
  		  cptr++;
+ 	    }
  	    cptr++;
  	    };
***************
*** 244,248 ****
  void do_output(void)
  {
!   char cmdline[256];
    FILE *asfile;
    char *tmpname = keep_flag ? "jumpas.tmp" : tmpnam(NULL);
--- 246,250 ----
  void do_output(void)
  {
!   char cmdline[1024];
    FILE *asfile;
    char *tmpname = keep_flag ? "jumpas.tmp" : tmpnam(NULL);
***************
*** 273,277 ****
    LINE * fpnt, *fprev, *ftmp, *ftail, *fixup_ptr;
    struct symbol * spnt, *stmp;
!   char index[64];
    int i;
    int fixup_list;
--- 275,279 ----
    LINE * fpnt, *fprev, *ftmp, *ftail, *fixup_ptr;
    struct symbol * spnt, *stmp;
!   char index[256];
    int i;
    int fixup_list;
***************
*** 675,679 ****
  	      if (gpnt)
  		{
! 		  char filename[256];
  		  GCMN_FILENAME(filename, filedir, gpnt);
  		  if ((gbldata = fopen(filename, "w"))==NULL)	
--- 677,681 ----
  	      if (gpnt)
  		{
! 		  char filename[1024];
  		  GCMN_FILENAME(filename, filedir, gpnt);
  		  if ((gbldata = fopen(filename, "w"))==NULL)	
***************
*** 865,869 ****
  		  for (j = i; fpnt->text[j]; j++)
  		    if (!(isalpha(fpnt->text[j]) || isdigit(fpnt->text[j]) ||
! 			  fpnt->text[j] == '_' || fpnt->text[j] == '$'))
  		      break;
  		  strncpy(scra, &fpnt->text[i], j-i);
--- 867,871 ----
  		  for (j = i; fpnt->text[j]; j++)
  		    if (!(isalpha(fpnt->text[j]) || isdigit(fpnt->text[j]) ||
! 	   fpnt->text[j] == '_' || fpnt->text[j]=='.' || fpnt->text[j] == '$'))
  		      break;
  		  strncpy(scra, &fpnt->text[i], j-i);
diff -C 2 -r ../otools/tools-2.16/tools/mkimage.c tools/mkimage.c
*** ../otools/tools-2.16/tools/mkimage.c	Mon Aug 15 23:17:24 1994
--- tools/mkimage.c	Thu Feb 16 10:41:05 1995
***************
*** 126,130 ****
  {
    char filename[256];
!   char wrapup[65536];
    int c;
    int force;
--- 126,130 ----
  {
    char filename[256];
!   char wrapup[1024000];
    int c;
    int force;
***************
*** 234,243 ****
    gihead = readgbls(filedir, JUMP_IGNORE, 0, "*");
  #endif
! 
     for (i = optind; i < argc; i++)
       {
         if(strcmp(argv[i], "-qmagic") == 0) 
  	 {
! 	   qmagic_library = 4096 - 32; /*number of text bytes we add in padding*/
  	   origin -= 4096;
  	   break;
--- 234,243 ----
    gihead = readgbls(filedir, JUMP_IGNORE, 0, "*");
  #endif
! /*
     for (i = optind; i < argc; i++)
       {
         if(strcmp(argv[i], "-qmagic") == 0) 
  	 {
! 	   qmagic_library = 4096 - 32; /*number of text bytes we add in padding
  	   origin -= 4096;
  	   break;
***************
*** 245,249 ****
  	 if(strcmp(argv[i], "-noqmagic") == 0) 
  	   {
! 	     qmagic_library = 0; /*number of text bytes we add in padding*/
  	     break;
  	   }
--- 245,249 ----
  	 if(strcmp(argv[i], "-noqmagic") == 0) 
  	   {
! 	     qmagic_library = 0; /*number of text bytes we add in padding
  	     break;
  	   }
***************
*** 252,259 ****
    if (qmagic_library == -1) {
      if(is_q_magic()) {
!       qmagic_library = 4096 - 32; /*number of text bytes we add in padding*/
        origin -= 4096;
      } else qmagic_library = 0;
    }
  
    /*
--- 252,261 ----
    if (qmagic_library == -1) {
      if(is_q_magic()) {
!       qmagic_library = 4096 - 32; /*number of text bytes we add in padding
        origin -= 4096;
      } else qmagic_library = 0;
    }
+ */
+   qmagic_library = 0;
  
    /*
diff -C 2 -r ../otools/tools-2.16/tools/utils.c tools/utils.c
*** ../otools/tools-2.16/tools/utils.c	Wed Aug 10 02:05:18 1994
--- tools/utils.c	Wed Feb 15 03:05:56 1995
***************
*** 149,158 ****
  GLOBAL *readgbls(char *filedir, char *fileroot, int flags, char * allowed)
  {
!   char filename[256];
!   char buffer[256];
!   char name[256];
!   char library[256];
!   char objfile[256];
!   char undefs[256];
    char type;
    char * cpnt, *cpnt1;
--- 149,158 ----
  GLOBAL *readgbls(char *filedir, char *fileroot, int flags, char * allowed)
  {
!   char filename[65536];
!   char buffer[65536];
!   char name[65536];
!   char library[65536];
!   char objfile[65536];
!   char undefs[65536];
    char type;
    char * cpnt, *cpnt1;
***************
*** 349,353 ****
  	       int major, int minor, int force){
    char filename[1024];
!   char buffer[128];
    int goof, m1, m2, pl, nargs;
    char * pnt;
--- 349,353 ----
  	       int major, int minor, int force){
    char filename[1024];
!   char buffer[65536];
    int goof, m1, m2, pl, nargs;
    char * pnt;
