Attachment 13142 Details for Bug 25147 – file.diff

[patch] file.diff

file.diff (text/plain), 1.81 KB, created by Gerhard Sittig on 2001-02-16 19:00:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Gerhard Sittig

Created: 2001-02-16 19:00:01 UTC

Size: 1.81 KB

patch

obsolete

>Index: pccardd/util.c
>===================================================================
>RCS file: /CVSREPO/fbsd/src/usr.sbin/pccard/pccardd/util.c,v
>retrieving revision 1.13.2.3
>diff -u -r1.13.2.3 util.c
>--- pccardd/util.c	2000/10/15 04:12:45	1.13.2.3
>+++ pccardd/util.c	2001/02/15 21:59:57
>@@ -237,8 +237,8 @@
> 			/* copy over preceding string. */
> 			while (lp != p)
> 				*cp++ = *lp++;
>-			/* stringify ethernet address and place here. */
> 			if (strncmp(p, "$ether", 6) == 0) {
>+			/* stringify ethernet address and place here. */
> 				sprintf(cp, "%x:%x:%x:%x:%x:%x",
> 				    sp->eaddr[0],
> 				    sp->eaddr[1],
>@@ -249,18 +249,36 @@
> 				while (*++cp)
> 					continue;
> 				lp += 6;
>-			} else
>-				/* replace device name */
>-				if (strncmp(p, "$device", 7) == 0) {
>-					sprintf(cp, "%s%d",
>-					    sp->config->driver->kernel,
>-					    sp->config->driver->unit);
>-					while (*cp)
>-						cp++;
>-					lp += 7;
>-				} else
>-					/* Copy the `$' and rescan. */
>-					*cp++ = *lp++;
>+			} else if (strncmp(p, "$device", 7) == 0) {
>+			/* replace device name */
>+				sprintf(cp, "%s%d",
>+				    sp->config->driver->kernel,
>+				    sp->config->driver->unit);
>+				while (*cp)
>+					cp++;
>+				lp += 7;
>+			} else if (strncmp(p, "$ioaddr", 7) == 0) {
>+			/* replace i/o address */
>+				sprintf(cp, "0x%X", sp->io.addr);
>+				while (*cp)
>+					cp++;
>+				lp += 7;
>+			} else if (strncmp(p, "$iosize", 7) == 0) {
>+			/* replace i/o window size */
>+				sprintf(cp, "0x%X", sp->io.size);
>+				while (*cp)
>+					cp++;
>+				lp += 7;
>+			} else if (strncmp(p, "$irqnum", 7) == 0) {
>+			/* replace irq number */
>+				sprintf(cp, "%d", sp->irq);
>+				while (*cp)
>+					cp++;
>+				lp += 7;
>+			} else {
>+			/* Copy the `$' and rescan. */
>+				*cp++ = *lp++;
>+			}
> 		}
> 		/* No more replacements. Copy rest of string. */
> 		while ((*cp++ = *lp++) != 0)

Actions: View | Diff

Attachments on bug 25147: 13142