*** 1.3	1992/05/09 22:58:24
--- 1.5	1996/09/05 18:01:55
***************
*** 46,52 ****
  	int i=0;
  	char *p1;
  
! 	bzero(&s, sizeof(s));
  	s.name = strdup(serv->name);
  
  	p = path;
--- 46,52 ----
  	int i=0;
  	char *p1;
  
! 	memset(&s, 0, sizeof(s));
  	s.name = strdup(serv->name);
  
  	p = path;
***************
*** 75,81 ****
  
  	if(found) {
  		for(i = 0; i < NSERVICES; i++) {
! 			bcopy(&s.fh[i], &serv->fh[i], sizeof(struct file_header));
  			serv->exists[i] = s.exists[i];
  		}
  		serv->path = s.path;
--- 75,81 ----
  
  	if(found) {
  		for(i = 0; i < NSERVICES; i++) {
! 			memcpy(&serv->fh[i], &s.fh[i], sizeof(struct file_header));
  			serv->exists[i] = s.exists[i];
  		}
  		serv->path = s.path;
***************
*** 238,244 ****
  			}
  			s = s->next;
  		}
! 		bzero(s, sizeof(struct service));
  		if((s->name = strdup(buf)) == NULL) {
  			(void) fclose(f);
  			return -1;
--- 238,244 ----
  			}
  			s = s->next;
  		}
! 		memset(s, 0, sizeof(struct service));
  		if((s->name = strdup(buf)) == NULL) {
  			(void) fclose(f);
  			return -1;
***************
*** 264,270 ****
  
  	s = (struct service *) malloc(sizeof(struct service));
  	if(s) {
! 		bzero(s, sizeof(struct service));
  		if((s->name = strdup(name)) == NULL) {
  			free(s);
  			s = NULL;
--- 264,270 ----
  
  	s = (struct service *) malloc(sizeof(struct service));
  	if(s) {
! 		memset(s, 0, sizeof(struct service));
  		if((s->name = strdup(name)) == NULL) {
  			free(s);
  			s = NULL;
***************
*** 301,307 ****
  	s = serv;
  	while(s) {
  		s->configured = 0;
! 		if((p = index(s->name, ':')) != NULL) {
  			if(os_path_ok(s->name)) return -1;
  			if(append_service_path(&path, ++p)) return -1;
  			s->configured = 1;
--- 301,307 ----
  	s = serv;
  	while(s) {
  		s->configured = 0;
! 		if((p = strchr(s->name, ':')) != NULL) {
  			if(os_path_ok(s->name)) return -1;
  			if(append_service_path(&path, ++p)) return -1;
  			s->configured = 1;
***************
*** 312,318 ****
  	/* Lookup services now */
  	s = serv;
  	while(s) {
! 		if(index(s->name, ':') == NULL) {
  			/* Real service */
  			if(!get_service(s, path) && !check_platform(s)) {
  				s->configured = 1;
--- 312,318 ----
  	/* Lookup services now */
  	s = serv;
  	while(s) {
! 		if(strchr(s->name, ':') == NULL) {
  			/* Real service */
  			if(!get_service(s, path) && !check_platform(s)) {
  				s->configured = 1;
***************
*** 359,365 ****
  		nserv = 0;
  		while(s) {
  			nserv++;
! 			if(!index(s->name, ':')) {
  				strcpy(buf, "#define ");
  				strcat(buf, s->name);
  				strcat(buf, " 1\n");
--- 359,365 ----
  		nserv = 0;
  		while(s) {
  			nserv++;
! 			if(!strchr(s->name, ':')) {
  				strcpy(buf, "#define ");
  				strcat(buf, s->name);
  				strcat(buf, " 1\n");
***************
*** 367,373 ****
  					(void) close(out_fd);
  					return -1;
  				}
! 			} /* index */
  			s = s->next;
  			
  		}
--- 367,373 ----
  					(void) close(out_fd);
  					return -1;
  				}
! 			} /* strchr */
  			s = s->next;
  			
  		}