===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tcfs/Attic/tcfserrors.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -c -r1.4 -r1.5
*** src/usr.bin/tcfs/Attic/tcfserrors.c	2000/06/19 20:35:47	1.4
--- src/usr.bin/tcfs/Attic/tcfserrors.c	2000/06/19 22:42:28	1.5
***************
*** 1,4 ****
! /*	$OpenBSD: tcfserrors.c,v 1.4 2000/06/19 20:35:47 fgsch Exp $	*/
  
  /*
   *	Transparent Cryptographic File System (TCFS) for NetBSD 
--- 1,4 ----
! /*	$OpenBSD: tcfserrors.c,v 1.5 2000/06/19 22:42:28 aaron Exp $	*/
  
  /*
   *	Transparent Cryptographic File System (TCFS) for NetBSD 
***************
*** 31,72 ****
  	"ioctl error while getting key counter."
  };
  
! void tcfs_error (int error_type, char *custom_message)
  {
! 	if (error_type!=ER_CUSTOM && error_type!=OK)
! 		fprintf (stderr, "Error: ");
  	
! 	switch (error_type)
! 	{
! 		case ER_AUTH:
! 		case ER_MEM:
! 		case ER_TCFS:
! 		case ER_PERM:
! 		case ER_ENABLE:
! 		case ER_DISABLE:
! 		case ER_COUNT:
! 		case ER_USER:
! 		case OK:
! 			fprintf (stderr, "%s\n", tcfs_errors_strings[error_type]);
! 			exit (error_type);
! 		case ER_CUSTOM:
! 			fprintf (stderr, "%s\n", custom_message);
! 			exit (1);
! 		case ER_UNKOPT:
! 			if (custom_message)
! 				fprintf (stderr, "%s: %s\n", tcfs_errors_strings[error_type], custom_message);
! 			else
! 				fprintf (stderr, "%s\n", tcfs_errors_strings[error_type]);
  			
! 			exit (error_type);
! 			break; /* Useless code */
! 		default:
! 			fprintf (stderr, "internal error.\n");
! 			exit (1);
  	}
  }
  
! void show_usage (char *fmt, char *arg)
  {
! 	printf (fmt, arg);
  }
--- 31,71 ----
  	"ioctl error while getting key counter."
  };
  
! void tcfs_error(int error_type, char *custom_message)
  {
! 	if (error_type != ER_CUSTOM && error_type != OK)
! 		fprintf(stderr, "Error: ");
  	
! 	switch (error_type) {
! 	case ER_AUTH:
! 	case ER_MEM:
! 	case ER_TCFS:
! 	case ER_PERM:
! 	case ER_ENABLE:
! 	case ER_DISABLE:
! 	case ER_COUNT:
! 	case ER_USER:
! 	case OK:
! 		fprintf(stderr, "%s\n", tcfs_errors_strings[error_type]);
! 		exit(error_type);
! 	case ER_CUSTOM:
! 		fprintf(stderr, "%s\n", custom_message);
! 		exit(1);
! 	case ER_UNKOPT:
! 		if (custom_message)
! 			fprintf(stderr, "%s: %s\n", tcfs_errors_strings[error_type], custom_message);
! 		else
! 			fprintf(stderr, "%s\n", tcfs_errors_strings[error_type]);
  			
! 		exit(error_type);
! 		break; /* Useless code */
! 	default:
! 		fprintf(stderr, "internal error.\n");
! 		exit(1);
  	}
  }
  
! void show_usage(char *fmt, char *arg)
  {
! 	printf(fmt, arg);
  }