===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/rdist/gram.y,v
retrieving revision 1.11
retrieving revision 1.12
diff -c -r1.11 -r1.12
*** src/usr.bin/rdist/gram.y	2014/06/07 15:28:21	1.11
--- src/usr.bin/rdist/gram.y	2015/01/20 09:00:16	1.12
***************
*** 1,5 ****
  %{
! /*	$OpenBSD: gram.y,v 1.11 2014/06/07 15:28:21 deraadt Exp $	*/
  
  /*
   * Copyright (c) 1993 Michael A. Cooper
--- 1,5 ----
  %{
! /*	$OpenBSD: gram.y,v 1.12 2015/01/20 09:00:16 guenther Exp $	*/
  
  /*
   * Copyright (c) 1993 Michael A. Cooper
***************
*** 31,37 ****
   * SUCH DAMAGE.
   */
  
! #include "defs.h"
  
  static struct namelist *addnl(struct namelist *, struct namelist *);
  static struct namelist *subnl(struct namelist *, struct namelist *);
--- 31,37 ----
   * SUCH DAMAGE.
   */
  
! #include "client.h"
  
  static struct namelist *addnl(struct namelist *, struct namelist *);
  static struct namelist *subnl(struct namelist *, struct namelist *);
***************
*** 408,421 ****
   */
  void
  insert(char *label, struct namelist *files, struct namelist *hosts,
!     struct subcmd *subcmds)
  {
  	struct cmd *c, *prev, *nc;
  	struct namelist *h, *lasth;
  
  	debugmsg(DM_CALL, "insert(%s, %p, %p, %p) start, files = %s", 
  		 label == NULL ? "(null)" : label,
! 		 files, hosts, subcmds, getnlstr(files));
  
  	files = expand(files, E_VARS|E_SHELL);
  	hosts = expand(hosts, E_ALL);
--- 408,421 ----
   */
  void
  insert(char *label, struct namelist *files, struct namelist *hosts,
!     struct subcmd *scmds)
  {
  	struct cmd *c, *prev, *nc;
  	struct namelist *h, *lasth;
  
  	debugmsg(DM_CALL, "insert(%s, %p, %p, %p) start, files = %s", 
  		 label == NULL ? "(null)" : label,
! 		 files, hosts, scmds, getnlstr(files));
  
  	files = expand(files, E_VARS|E_SHELL);
  	hosts = expand(hosts, E_ALL);
***************
*** 442,448 ****
  		nc->c_name = h->n_name;
  		nc->c_label = label;
  		nc->c_files = files;
! 		nc->c_cmds = subcmds;
  		nc->c_flags = 0;
  		nc->c_next = c;
  		if (prev == NULL)
--- 442,448 ----
  		nc->c_name = h->n_name;
  		nc->c_label = label;
  		nc->c_files = files;
! 		nc->c_cmds = scmds;
  		nc->c_flags = 0;
  		nc->c_next = c;
  		if (prev == NULL)
***************
*** 460,466 ****
   * executed in the order they appear in the distfile.
   */
  void
! append(char *label, struct namelist *files, char *stamp, struct subcmd *subcmds)
  {
  	struct cmd *c;
  
--- 460,466 ----
   * executed in the order they appear in the distfile.
   */
  void
! append(char *label, struct namelist *files, char *stamp, struct subcmd *scmds)
  {
  	struct cmd *c;
  
***************
*** 469,475 ****
  	c->c_name = stamp;
  	c->c_label = label;
  	c->c_files = expand(files, E_ALL);
! 	c->c_cmds = subcmds;
  	c->c_next = NULL;
  	if (cmds == NULL)
  		cmds = last_cmd = c;
--- 469,475 ----
  	c->c_name = stamp;
  	c->c_label = label;
  	c->c_files = expand(files, E_ALL);
! 	c->c_cmds = scmds;
  	c->c_next = NULL;
  	if (cmds == NULL)
  		cmds = last_cmd = c;