===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/rdist/rdist.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -c -r1.17 -r1.18
*** src/usr.bin/rdist/rdist.c	2003/06/03 02:56:15	1.17
--- src/usr.bin/rdist/rdist.c	2007/02/26 15:38:04	1.18
***************
*** 1,4 ****
! /*	$OpenBSD: rdist.c,v 1.17 2003/06/03 02:56:15 millert Exp $	*/
  
  /*
   * Copyright (c) 1983 Regents of the University of California.
--- 1,4 ----
! /*	$OpenBSD: rdist.c,v 1.18 2007/02/26 15:38:04 jmc Exp $	*/
  
  /*
   * Copyright (c) 1983 Regents of the University of California.
***************
*** 38,44 ****
  "$From: rdist.c,v 1.6 2001/03/12 18:16:36 kim Exp $";
  #else
  static char RCSid[] __attribute__((__unused__)) =
! "$OpenBSD: rdist.c,v 1.17 2003/06/03 02:56:15 millert Exp $";
  #endif
  
  static char sccsid[] __attribute__((__unused__)) =
--- 38,44 ----
  "$From: rdist.c,v 1.6 2001/03/12 18:16:36 kim Exp $";
  #else
  static char RCSid[] __attribute__((__unused__)) =
! "$OpenBSD: rdist.c,v 1.18 2007/02/26 15:38:04 jmc Exp $";
  #endif
  
  static char sccsid[] __attribute__((__unused__)) =
***************
*** 361,383 ****
  static void
  usage(void)
  {
! 	char *sopts = "cDFnv";
  
  	(void) fprintf(stderr,
! 		      "Usage: %s [-%s] [-A <num>] [-a <num>] [-d var=value]\n",
! 		       progname, sopts);
! 	(void) fprintf(stderr, 
!        "\t[-f distfile] [-l <msgopt>] [-L <msgopt>] [-M <maxproc>]\n");
! 	(void) fprintf(stderr, 
!        "\t[-m host] [-o <distopts>] [-p <rdistd-cmd>] [-P <rsh-path>]\n");
! 	(void) fprintf(stderr, 
!        "\t[-t <timeout>] [target ...]\n");
  
- 	(void) fprintf(stderr,
- 		      "OR:    %s [-%s] -c source [...] machine[:dest]\n", 
- 		       progname, sopts);
- 
- 	(void) fprintf(stderr, "OR:    %s -V\n", progname);
  
  	(void) fprintf(stderr, "\nThe values for <distopts> are:\n\t%s\n",
  		       getdistoptlist());
--- 361,377 ----
  static void
  usage(void)
  {
! 	extern char *__progname;
  
  	(void) fprintf(stderr,
! 		"usage: %s [-DFnV] [-Server] [-A num] [-a num] "
! 		"[-c mini_distfile]\n"
! 		"\t[-d var=value] [-f distfile] [-L remote_logopts] "
! 		"[-l local_logopts]\n"
! 		"\t[-M maxproc] [-m host] [-o distopts] [-P rsh-path] "
! 		"[-p rdistd-path]\n"
! 		"\t[-t timeout] [name ...]\n", __progname);
  
  
  	(void) fprintf(stderr, "\nThe values for <distopts> are:\n\t%s\n",
  		       getdistoptlist());