===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tftp/main.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -c -r1.8 -r1.9
*** src/usr.bin/tftp/main.c	2001/07/31 14:32:15	1.8
--- src/usr.bin/tftp/main.c	2001/11/19 19:02:16	1.9
***************
*** 1,4 ****
! /*	$OpenBSD: main.c,v 1.8 2001/07/31 14:32:15 mpech Exp $	*/
  /*	$NetBSD: main.c,v 1.6 1995/05/21 16:54:10 mycroft Exp $	*/
  
  /*
--- 1,4 ----
! /*	$OpenBSD: main.c,v 1.9 2001/11/19 19:02:16 mpech Exp $	*/
  /*	$NetBSD: main.c,v 1.6 1995/05/21 16:54:10 mycroft Exp $	*/
  
  /*
***************
*** 44,50 ****
  #if 0
  static char sccsid[] = "@(#)main.c	8.1 (Berkeley) 6/6/93";
  #endif
! static char rcsid[] = "$OpenBSD: main.c,v 1.8 2001/07/31 14:32:15 mpech Exp $";
  #endif /* not lint */
  
  /* Many bug fixes are from Jim Guyton <guyton@rand-unix> */
--- 44,50 ----
  #if 0
  static char sccsid[] = "@(#)main.c	8.1 (Berkeley) 6/6/93";
  #endif
! static char rcsid[] = "$OpenBSD: main.c,v 1.9 2001/11/19 19:02:16 mpech Exp $";
  #endif /* not lint */
  
  /* Many bug fixes are from Jim Guyton <guyton@rand-unix> */
***************
*** 253,259 ****
  	int argc;
  	char *argv[];
  {
! 	register struct modes *p;
  	char *sep;
  
  	if (argc < 2) {
--- 253,259 ----
  	int argc;
  	char *argv[];
  {
! 	struct modes *p;
  	char *sep;
  
  	if (argc < 2) {
***************
*** 320,327 ****
  	char *argv[];
  {
  	int fd;
! 	register int n;
! 	register char *cp, *targ;
  
  	if (argc < 2) {
  		strcpy(line, "send ");
--- 320,327 ----
  	char *argv[];
  {
  	int fd;
! 	int n;
! 	char *cp, *targ;
  
  	if (argc < 2) {
  		strcpy(line, "send ");
***************
*** 413,420 ****
  	char *argv[];
  {
  	int fd;
! 	register int n;
! 	register char *cp;
  	char *src;
  
  	if (argc < 2) {
--- 413,420 ----
  	char *argv[];
  {
  	int fd;
! 	int n;
! 	char *cp;
  	char *src;
  
  	if (argc < 2) {
***************
*** 578,584 ****
  tail(filename)
  	char *filename;
  {
! 	register char *s;
  
  	while (*filename) {
  		s = strrchr(filename, '/');
--- 578,584 ----
  tail(filename)
  	char *filename;
  {
! 	char *s;
  
  	while (*filename) {
  		s = strrchr(filename, '/');
***************
*** 597,603 ****
  static __dead void
  command()
  {
! 	register struct cmd *c;
  
  	for (;;) {
  		printf("%s> ", prompt);
--- 597,603 ----
  static __dead void
  command()
  {
! 	struct cmd *c;
  
  	for (;;) {
  		printf("%s> ", prompt);
***************
*** 629,639 ****
  
  struct cmd *
  getcmd(name)
! 	register char *name;
  {
! 	register char *p, *q;
! 	register struct cmd *c, *found;
! 	register int nmatches, longest;
  
  	longest = 0;
  	nmatches = 0;
--- 629,639 ----
  
  struct cmd *
  getcmd(name)
! 	char *name;
  {
! 	char *p, *q;
! 	struct cmd *c, *found;
! 	int nmatches, longest;
  
  	longest = 0;
  	nmatches = 0;
***************
*** 662,669 ****
  static int
  makeargv()
  {
! 	register char *cp;
! 	register char **argp = margv;
  	int ret = 0;
  
  	margc = 0;
--- 662,669 ----
  static int
  makeargv()
  {
! 	char *cp;
! 	char **argp = margv;
  	int ret = 0;
  
  	margc = 0;
***************
*** 706,712 ****
  	int argc;
  	char *argv[];
  {
! 	register struct cmd *c;
  
  	if (argc == 1) {
  		printf("Commands may be abbreviated.  Commands are:\n\n");
--- 706,712 ----
  	int argc;
  	char *argv[];
  {
! 	struct cmd *c;
  
  	if (argc == 1) {
  		printf("Commands may be abbreviated.  Commands are:\n\n");
***************
*** 715,721 ****
  		return;
  	}
  	while (--argc > 0) {
! 		register char *arg;
  		arg = *++argv;
  		c = getcmd(arg);
  		if (c == (struct cmd *)-1)
--- 715,721 ----
  		return;
  	}
  	while (--argc > 0) {
! 		char *arg;
  		arg = *++argv;
  		c = getcmd(arg);
  		if (c == (struct cmd *)-1)