===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/mail/fio.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -c -r1.16 -r1.17
*** src/usr.bin/mail/fio.c	1998/06/12 17:51:51	1.16
--- src/usr.bin/mail/fio.c	2000/08/02 04:10:48	1.17
***************
*** 1,4 ****
! /*	$OpenBSD: fio.c,v 1.16 1998/06/12 17:51:51 millert Exp $	*/
  /*	$NetBSD: fio.c,v 1.8 1997/07/07 22:57:55 phil Exp $	*/
  
  /*
--- 1,4 ----
! /*	$OpenBSD: fio.c,v 1.17 2000/08/02 04:10:48 millert Exp $	*/
  /*	$NetBSD: fio.c,v 1.8 1997/07/07 22:57:55 phil Exp $	*/
  
  /*
***************
*** 38,44 ****
  #if 0
  static char sccsid[] = "@(#)fio.c	8.2 (Berkeley) 4/20/95";
  #else
! static char rcsid[] = "$OpenBSD: fio.c,v 1.16 1998/06/12 17:51:51 millert Exp $";
  #endif
  #endif /* not lint */
  
--- 38,44 ----
  #if 0
  static char sccsid[] = "@(#)fio.c	8.2 (Berkeley) 4/20/95";
  #else
! static char rcsid[] = "$OpenBSD: fio.c,v 1.17 2000/08/02 04:10:48 millert Exp $";
  #endif
  #endif /* not lint */
  
***************
*** 389,395 ****
  		name = savestr(xname);
  	}
  	/* catch the most common shell meta character */
! 	if (name[0] == '~' && (name[1] == '/' || name[1] == '\0')) {
  		(void)snprintf(xname, sizeof(xname), "%s%s", homedir, name + 1);
  		name = savestr(xname);
  	}
--- 389,395 ----
  		name = savestr(xname);
  	}
  	/* catch the most common shell meta character */
! 	if (name[0] == '~' && homedir && (name[1] == '/' || name[1] == '\0')) {
  		(void)snprintf(xname, sizeof(xname), "%s%s", homedir, name + 1);
  		name = savestr(xname);
  	}
***************
*** 455,461 ****
  		strncpy(name, folder, namelen-1);
  		name[namelen-1] = '\0';
  	} else
! 		(void)snprintf(name, namelen, "%s/%s", homedir, folder);
  	return(0);
  }
  
--- 455,462 ----
  		strncpy(name, folder, namelen-1);
  		name[namelen-1] = '\0';
  	} else
! 		(void)snprintf(name, namelen, "%s/%s", homedir ? homedir : ".",
! 		    folder);
  	return(0);
  }