===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/elf2olf/Attic/elf2olf.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -c -r1.4 -r1.5
*** src/usr.bin/elf2olf/Attic/elf2olf.c	1997/01/15 23:42:46	1.4
--- src/usr.bin/elf2olf/Attic/elf2olf.c	2001/07/12 05:17:01	1.5
***************
*** 1,4 ****
! /*      $OpenBSD: elf2olf.c,v 1.4 1997/01/15 23:42:46 millert Exp $	*/
  /*
   * Copyright (c) 1996 Erik Theisen.  All rights reserved.
   *
--- 1,4 ----
! /*      $OpenBSD: elf2olf.c,v 1.5 2001/07/12 05:17:01 deraadt Exp $	*/
  /*
   * Copyright (c) 1996 Erik Theisen.  All rights reserved.
   *
***************
*** 30,36 ****
  #endif /* not lint */
  
  #ifndef lint
! static char rcsid[] = "@(#) $Id: elf2olf.c,v 1.4 1997/01/15 23:42:46 millert Exp $";
  #endif
  
  #include <stdlib.h>
--- 30,36 ----
  #endif /* not lint */
  
  #ifndef lint
! static char rcsid[] = "@(#) $Id: elf2olf.c,v 1.5 2001/07/12 05:17:01 deraadt Exp $";
  #endif
  
  #include <stdlib.h>
***************
*** 59,64 ****
--- 59,67 ----
  #define word(x,y)((y == ELFDATA2LSB) ? ntohl(htonl(x)) : ntohl(x))
  #define half(x,y)((y == ELFDATA2LSB) ? ntohs(htons(x)) : ntohs(x))
  
+ void usage(void);
+ void pwarn(char *, char *, int);
+ 
  int
  main(int argc, char*argv[])
  {
***************
*** 73,79 ****
      Elf32_Shdr shdr;
      int e;
      
!     if (progname = strrchr(*argv, '/'))
  	++progname;
      else
  	progname = *argv;
--- 76,82 ----
      Elf32_Shdr shdr;
      int e;
      
!     if ((progname = strrchr(*argv, '/')))
  	++progname;
      else
  	progname = *argv;
***************
*** 163,176 ****
  				else if (word(shdr.sh_type, e) == SHT_DYNAMIC)
  				    ehdr.e_ident[OI_DYNAMIC] = ODYNAMIC;
  			    } else
! 				warn(progname, *argv, errno);
  			} /* while less than number of section headers */
  
  			/* We're ready to modify */
  			okay = 1;
  
  		    } else /* Bogus section header table seek */
! 			warn(progname, *argv, errno);
  
  		} else { /* olf2elf */
  		    ehdr.e_ident[EI_MAG0]    = ELFMAG0;
--- 166,179 ----
  				else if (word(shdr.sh_type, e) == SHT_DYNAMIC)
  				    ehdr.e_ident[OI_DYNAMIC] = ODYNAMIC;
  			    } else
! 				pwarn(progname, *argv, errno);
  			} /* while less than number of section headers */
  
  			/* We're ready to modify */
  			okay = 1;
  
  		    } else /* Bogus section header table seek */
! 			pwarn(progname, *argv, errno);
  
  		} else { /* olf2elf */
  		    ehdr.e_ident[EI_MAG0]    = ELFMAG0;
***************
*** 184,190 ****
  		    okay = 1;
  		} /* olf2elf */
  	    } else /* Bogus non-ELF file encountered */
! 		warn(progname, *argv, ENOEXEC);
  
  	    /*
  	     * Do It.
--- 187,193 ----
  		    okay = 1;
  		} /* olf2elf */
  	    } else /* Bogus non-ELF file encountered */
! 		pwarn(progname, *argv, ENOEXEC);
  
  	    /*
  	     * Do It.
***************
*** 207,228 ****
  				printf("OLF %s => ELF.\n", *argv);
  			}
  		    } else /* bad write */
! 			warn(progname, *argv, errno);	
  		} else /* bad seek */
! 		    warn(progname, *argv, errno);
  	    } /* okay? */
  	    fsync(fd);
  	    close(fd);
  
  	} else /* couldn't handle file */
! 	    warn(progname, *argv, errno);
      } while (*(++argv) != NULL);
      
  
      return (retval);
  }
  
! warn(name, fname, errval)
      char *name;
      char *fname;
      int errval;
--- 210,232 ----
  				printf("OLF %s => ELF.\n", *argv);
  			}
  		    } else /* bad write */
! 			pwarn(progname, *argv, errno);	
  		} else /* bad seek */
! 		    pwarn(progname, *argv, errno);
  	    } /* okay? */
  	    fsync(fd);
  	    close(fd);
  
  	} else /* couldn't handle file */
! 	    pwarn(progname, *argv, errno);
      } while (*(++argv) != NULL);
      
  
      return (retval);
  }
  
! void
! pwarn(name, fname, errval)
      char *name;
      char *fname;
      int errval;
***************
*** 231,236 ****
--- 235,241 ----
      retval = 1;
  }
  
+ void
  usage()
  {
      register int i;