Attachment 20656 Details for Bug 36418 – file.diff

[patch] file.diff

file.diff (text/plain), 1.47 KB, created by forrestc on 2002-03-28 10:10:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: forrestc

Created: 2002-03-28 10:10:01 UTC

Size: 1.47 KB

patch

obsolete

>*** /usr/src/usr.sbin/pccard/pccardd/pccardd.c	Tue Sep  4 20:51:36 2001
>--- pccardd.c	Wed Mar 27 02:31:39 2002
>***************
>*** 156,167 ****
>  {
>  	struct slot *sp;
>  	int count, dodebug = 0;
>  	int delay = 0;
>  	int irq_arg[16];
>  	int irq_specified = 0;
>  	int i;
>  	struct sockaddr_un sun;
>! #define	COM_OPTS	":Idvf:s:i:z"
>  
>  	bzero(irq_arg, sizeof(irq_arg));
>  	use_kern_irq = 1;
>--- 156,168 ----
>  {
>  	struct slot *sp;
>  	int count, dodebug = 0;
>+         int probeonly = 0;
>  	int delay = 0;
>  	int irq_arg[16];
>  	int irq_specified = 0;
>  	int i;
>  	struct sockaddr_un sun;
>! #define	COM_OPTS	":Idvf:s:i:zx"
>  
>  	bzero(irq_arg, sizeof(irq_arg));
>  	use_kern_irq = 1;
>***************
>*** 196,201 ****
>--- 197,205 ----
>  		case 's':
>  			sock = optarg;
>  			break;
>+ 		case 'x':
>+ 			probeonly = 1;
>+ 			break;
>  		case 'z':
>  			delay = 1;
>  			break;
>***************
>*** 224,235 ****
>  	if (doverbose)
>  		dump_config_file();
>  	log_setup();
>! 	if (!dodebug && !delay)
>  		if (daemon(0, 0))
>  			die("fork failed");
>  	slots = readslots();
>  	if (slots == 0)
>  		die("no PC-CARD slots");
>  	if (delay)
>  		if (daemon(0, 0))
>  			die("fork failed");
>--- 228,241 ----
>  	if (doverbose)
>  		dump_config_file();
>  	log_setup();
>! 	if (!dodebug && !delay && !probeonly)
>  		if (daemon(0, 0))
>  			die("fork failed");
>  	slots = readslots();
>  	if (slots == 0)
>  		die("no PC-CARD slots");
>+         if (probeonly)
>+                 exit(0);
>  	if (delay)
>  		if (daemon(0, 0))
>  			die("fork failed");

Actions: View | Diff

Attachments on bug 36418: 20656 | 20657