===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tcfs/Attic/tcfsrmgroup.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -c -r1.5 -r1.6
*** src/usr.bin/tcfs/Attic/tcfsrmgroup.c	2000/06/19 20:54:12	1.5
--- src/usr.bin/tcfs/Attic/tcfsrmgroup.c	2000/06/19 22:42:29	1.6
***************
*** 1,4 ****
! /*	$OpenBSD: tcfsrmgroup.c,v 1.5 2000/06/19 20:54:12 fgsch Exp $	*/
  
  /*
   *	Transparent Cryptographic File System (TCFS) for NetBSD 
--- 1,4 ----
! /*	$OpenBSD: tcfsrmgroup.c,v 1.6 2000/06/19 22:42:29 aaron Exp $	*/
  
  /*
   *	Transparent Cryptographic File System (TCFS) for NetBSD 
***************
*** 28,34 ****
    -v           Makes the output a little more verbose\n";
  
  int
! rmgroup_main (int argn, char *argv[])
  {
  	int val;
  	gid_t gid;
--- 28,34 ----
    -v           Makes the output a little more verbose\n";
  
  int
! rmgroup_main(int argn, char *argv[])
  {
  	int val;
  	gid_t gid;
***************
*** 44,70 ****
  			if (!gid && optarg[0] != '0') { /* group name given */ 
  				struct group *group_id;
  
! 				group_id=getgrnam(optarg);
  				if (!group_id)
! 					tcfs_error (ER_CUSTOM, "Nonexistent group.");
! 				gid=group_id->gr_gid;
  			}
  
! 			have_gid=TRUE;
  			break;
  		case 'h':
! 			show_usage (rmgroup_usage, argv[0]);
! 			exit (OK);
  		case 'v':
! 			be_verbose=TRUE;
  			break;
  		default:
! 			fprintf (stderr, "Try %s --help for more informations.\n", argv[0]);
! 			exit (ER_UNKOPT);
  		}
  
! 	if (argn-optind)
! 		tcfs_error (ER_UNKOPT, NULL);
  
  	if (!have_gid) {
  		char *buff = NULL;
--- 44,70 ----
  			if (!gid && optarg[0] != '0') { /* group name given */ 
  				struct group *group_id;
  
! 				group_id = getgrnam(optarg);
  				if (!group_id)
! 					tcfs_error(ER_CUSTOM, "Nonexistent group.");
! 				gid = group_id->gr_gid;
  			}
  
! 			have_gid = TRUE;
  			break;
  		case 'h':
! 			show_usage(rmgroup_usage, argv[0]);
! 			exit(OK);
  		case 'v':
! 			be_verbose = TRUE;
  			break;
  		default:
! 			fprintf(stderr, "Try %s --help for more informations.\n", argv[0]);
! 			exit(ER_UNKOPT);
  		}
  
! 	if (argn - optind)
! 		tcfs_error(ER_UNKOPT, NULL);
  
  	if (!have_gid) {
  		char *buff = NULL;
***************
*** 72,100 ****
  
  		buff = (char*)calloc(2048, sizeof(char));
  		if (!buff)
! 			tcfs_error (ER_MEM, NULL);
  
! 		printf ("Group id of the TCFS group to remove from the database: ");
! 		fgets (buff,2048,stdin);
  		len = strlen(buff) - 1;
  		buff[len] = buff[len] == '\n' ? 0 : buff[len];
! 		gid=(gid_t)atoi(buff);
  
  		if (!gid && optarg[0] != '0') { /* group name given */
  			struct group *group_id;
  
  			group_id = getgrnam(optarg);
  			if (!group_id)
! 				tcfs_error (ER_CUSTOM, "Nonexistent group.");
! 			gid=group_id->gr_gid;
  		}
  
! 		if (gid <=0 )
! 			tcfs_error (ER_CUSTOM, "A positive ID please!");
  
! 		free (buff);
  	}
  
! 	if (!tcfs_rmgroup (gid))
! 		tcfs_error (ER_CUSTOM, "Wrong ID or an error as occurred.\n");
  }
--- 72,100 ----
  
  		buff = (char*)calloc(2048, sizeof(char));
  		if (!buff)
! 			tcfs_error(ER_MEM, NULL);
  
! 		printf("Group id of the TCFS group to remove from the database: ");
! 		fgets(buff, 2048, stdin);
  		len = strlen(buff) - 1;
  		buff[len] = buff[len] == '\n' ? 0 : buff[len];
! 		gid = (gid_t)atoi(buff);
  
  		if (!gid && optarg[0] != '0') { /* group name given */
  			struct group *group_id;
  
  			group_id = getgrnam(optarg);
  			if (!group_id)
! 				tcfs_error(ER_CUSTOM, "Nonexistent group.");
! 			gid = group_id->gr_gid;
  		}
  
! 		if (gid <= 0)
! 			tcfs_error(ER_CUSTOM, "A positive ID please!");
  
! 		free(buff);
  	}
  
! 	if (!tcfs_rmgroup(gid))
! 		tcfs_error(ER_CUSTOM, "Wrong ID or an error as occurred.\n");
  }