From 1709a4fd6a98ded5e879f4b01146adeca89f89df Mon Sep 17 00:00:00 2001 From: Poul-Henning Kamp Date: Mon, 28 Oct 2002 22:40:49 +0000 Subject: [PATCH] Fix the wizardmodes 'write' command to not explode: Don't reference the name in the disk tree we just deleted when we reopen. --- usr.sbin/sade/wizard.c | 6 ++---- usr.sbin/sysinstall/wizard.c | 6 ++---- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/usr.sbin/sade/wizard.c b/usr.sbin/sade/wizard.c index e9c0da57ced..3a078871738 100644 --- a/usr.sbin/sade/wizard.c +++ b/usr.sbin/sade/wizard.c @@ -169,8 +169,9 @@ slice_wizard(Disk *d) if (!strcasecmp(*cmds,"write")) { printf("Write=%d\n", Fake ? 0 : Write_Disk(d)); + q = strdup(d->name); Free_Disk(d); - d = Open_Disk(d->name); + d = Open_Disk(q); continue; } if (strcasecmp(*cmds,"help")) @@ -192,9 +193,6 @@ slice_wizard(Disk *d) printf("read [disk]\t\t"); printf("scan\n"); printf("write\t\t"); - printf("ENUM:\n\t"); - for(i=0;chunk_n[i];i++) - printf("%d = %s%s",i,chunk_n[i],i == 4 ? "\n\t" : " "); printf("\n"); } diff --git a/usr.sbin/sysinstall/wizard.c b/usr.sbin/sysinstall/wizard.c index e9c0da57ced..3a078871738 100644 --- a/usr.sbin/sysinstall/wizard.c +++ b/usr.sbin/sysinstall/wizard.c @@ -169,8 +169,9 @@ slice_wizard(Disk *d) if (!strcasecmp(*cmds,"write")) { printf("Write=%d\n", Fake ? 0 : Write_Disk(d)); + q = strdup(d->name); Free_Disk(d); - d = Open_Disk(d->name); + d = Open_Disk(q); continue; } if (strcasecmp(*cmds,"help")) @@ -192,9 +193,6 @@ slice_wizard(Disk *d) printf("read [disk]\t\t"); printf("scan\n"); printf("write\t\t"); - printf("ENUM:\n\t"); - for(i=0;chunk_n[i];i++) - printf("%d = %s%s",i,chunk_n[i],i == 4 ? "\n\t" : " "); printf("\n"); }