d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Handle WinNT .inf files with a $windows nt$ signature but no .NT decorated

Browse Source 
AddReg sections.

Also insert extra newline after emitting device name overrides.
This commit is contained in:
Bill Paul 2004-01-02 21:13:21 +00:00
parent d0058957b5
commit ade996adb6
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=124085
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
usr.sbin/ndiscvt/inf.c
View File

@ -398,7 +398,12 @@ dump_regvals(void)
struct section *sec;
struct assign *assign;
char sname[256];
int i, is_winxp = 0, devidx = 0;
int i, is_winxp = 0, is_winnt = 0, devidx = 0;
/* Find signature to check for special case of WinNT. */
assign = find_assign("version", "signature");
if (strcasecmp(assign->vals[0], "$windows nt$") == 0)
is_winnt++;
/* Find manufacturer name */
manf = find_assign("Manufacturer", NULL);
@ -434,6 +439,9 @@ dump_regvals(void)
} else {
sprintf(sname, "%s.NT", assign->vals[0]);
dev = find_assign(sname, "AddReg");
if (dev == NULL && is_winnt)
dev = find_assign(assign->vals[0],
"AddReg");
}
/* Section not found. */
if (dev == NULL)

2
usr.sbin/ndiscvt/ndiscvt.c
View File

@ -232,7 +232,7 @@ main(int argc, char *argv[])
err(1, "selected device name '%s' is "
"too long (max chars: %d)", dname, IFNAMSIZ);
fprintf (outfp, "#define NDIS_DEVNAME \"%s\"\n", dname);
fprintf (outfp, "#define NDIS_MODNAME %s\n", dname);
fprintf (outfp, "#define NDIS_MODNAME %s\n\n", dname);
}
if (inffile == NULL) {