diff -ruN linuxfirmwarekit/dsdt.c linuxfirmwarekit-modified/dsdt.c --- linuxfirmwarekit/dsdt.c 2007-04-13 13:05:27 +0400 +++ linuxfirmwarekit-modified/dsdt.c 2007-04-13 13:07:55 +0400 @@ -71,24 +71,24 @@ } /* Disassemble DSDT.dat with iasl, will create DSDT.dsl */ - system("plugins/iasl -d DSDT.dat &>/dev/null"); + system("/usr/bin/iasl -d DSDT.dat >/dev/null 2>&1"); if (access("DSDT.dsl", R_OK)) fprintf(stderr,"WARN (iasl): failed to create DSDT.dsl.\n"); /* Include ACPI table for external symbol resolution (if they exist) */ - system("plugins/iasl -d -e DSDT.dat SSDT.dat &>/dev/null"); - system("plugins/iasl -d -e DSDT.dat SSDT1.dat &>/dev/null"); - system("plugins/iasl -d -e DSDT.dat SSDT2.dat &>/dev/null"); - system("plugins/iasl -d -e DSDT.dat SSDT3.dat &>/dev/null"); - system("plugins/iasl -d -e DSDT.dat SSDT4.dat &>/dev/null"); - system("plugins/iasl -d -e DSDT.dat SSDT5.dat &>/dev/null"); - system("plugins/iasl -d -e DSDT.dat SSDT6.dat &>/dev/null"); - system("plugins/iasl -d -e DSDT.dat SSDT7.dat &>/dev/null"); - system("plugins/iasl -d -e DSDT.dat SSDT8.dat &>/dev/null"); - system("plugins/iasl -d -e DSDT.dat SSDT9.dat &>/dev/null"); + system("/usr/bin/iasl -d -e DSDT.dat SSDT.dat >/dev/null 2>&1"); + system("/usr/bin/iasl -d -e DSDT.dat SSDT1.dat >/dev/null 2>&1"); + system("/usr/bin/iasl -d -e DSDT.dat SSDT2.dat >/dev/null 2>&1"); + system("/usr/bin/iasl -d -e DSDT.dat SSDT3.dat >/dev/null 2>&1"); + system("/usr/bin/iasl -d -e DSDT.dat SSDT4.dat >/dev/null 2>&1"); + system("/usr/bin/iasl -d -e DSDT.dat SSDT5.dat >/dev/null 2>&1"); + system("/usr/bin/iasl -d -e DSDT.dat SSDT6.dat >/dev/null 2>&1"); + system("/usr/bin/iasl -d -e DSDT.dat SSDT7.dat >/dev/null 2>&1"); + system("/usr/bin/iasl -d -e DSDT.dat SSDT8.dat >/dev/null 2>&1"); + system("/usr/bin/iasl -d -e DSDT.dat SSDT9.dat >/dev/null 2>&1"); /* current iasl has an issue with arugment counts in SSDT's, work around this */ - system("sed -i -e \"s/^ACPI Error.*Argument count mismatch for method.*//g\" SSDT*.dsl &> /dev/null"); + system("sed -i -e \"s/^ACPI Error.*Argument count mismatch for method.*//g\" SSDT*.dsl > /dev/null 2>&1"); } diff -ruN linuxfirmwarekit/libstandalone.c linuxfirmwarekit-modified/libstandalone.c --- linuxfirmwarekit/libstandalone.c 2007-03-24 04:16:50 +0300 +++ linuxfirmwarekit-modified/libstandalone.c 2007-04-13 13:04:29 +0400 @@ -197,14 +197,14 @@ sprintf(cmd_prefix, "plugins/"); /* create hex-dump format of all acpi tables in file 'acpi.dump' */ - sprintf(command, "%sacpidump > acpi.dump &> /dev/null", cmd_prefix); + sprintf(command, "%sacpidump > acpi.dump > /dev/null 2>&1", cmd_prefix); system(command); if (access("acpi.dump", R_OK)) fprintf(stderr,"WARN (acpidump): failed to create acpi.dump.\n"); /* use 'acpidump' file to extract dsdt and ssdt tables * in binary format, creates DSDT.dat and SSDT*.dat */ - sprintf(command, "%sacpixtract acpi.dump &> /dev/null", cmd_prefix); + sprintf(command, "%sacpixtract acpi.dump > /dev/null 2>&1", cmd_prefix); system(command); if (access("DSDT.dat", R_OK)) { ret = system("cat /proc/acpi/dsdt > DSDT.dat"); @@ -215,7 +215,7 @@ } /* Disassemble DSDT.dat with iasl, will create DSDT.dsl */ - sprintf(command, "%siasl -d DSDT.dat &>/dev/null", cmd_prefix); + sprintf(command, "%siasl -d DSDT.dat >/dev/null 2>&1", cmd_prefix); system(command); file = fopen("DSDT.dsl", "r"); if (!file) @@ -239,7 +239,7 @@ else sprintf(filen, "SSDT%d", i); - sprintf(command, "%siasl -d -e DSDT.dat %s.dat &>/dev/null", cmd_prefix, filen); + sprintf(command, "%siasl -d -e DSDT.dat %s.dat >/dev/null 2>&1", cmd_prefix, filen); system(command); strcat(filen, ".dsl"); @@ -258,7 +258,7 @@ } /* current iasl has an issue with arugment counts in SSDT's, work around this */ - system("sed -i -e \"s/^ACPI Error.*Argument count mismatch for method.*//g\" SSDT*.dsl &> /dev/null"); + system("sed -i -e \"s/^ACPI Error.*Argument count mismatch for method.*//g\" SSDT*.dsl > /dev/null 2>&1"); } diff -ruN linuxfirmwarekit/usb.c linuxfirmwarekit-modified/usb.c --- linuxfirmwarekit/usb.c 2007-03-24 07:27:08 +0300 +++ linuxfirmwarekit-modified/usb.c 2007-04-13 13:08:34 +0400 @@ -75,17 +75,17 @@ continue; /* ok so we have a removable device with USB in the device string. Assume it's an USB key */ - sprintf(buffer, "/bin/mount /dev/%s1 /usbkey &> mountlog", entry->d_name); + sprintf(buffer, "/bin/mount /dev/%s1 /usbkey > mountlog 2>&1", entry->d_name); if (system(buffer)!=0) { /* no cookie; maybe there was no partition table */ - sprintf(buffer, "/bin/mount /dev/%s /usbkey &> mountlog", entry->d_name); + sprintf(buffer, "/bin/mount /dev/%s /usbkey > mountlog 2>&1", entry->d_name); if (system(buffer)!=0) continue; } - system("/bin/cp results/* /usbkey &> /dev/null"); - system("/bin/cp acpi.dump /usbkey &> /dev/null"); - system("/bin/cp DSDT.* /usbkey &> /dev/null"); - system("/bin/umount /usbkey &> /dev/null"); + system("/bin/cp results/* /usbkey > /dev/null > 2>&1"); + system("/bin/cp acpi.dump /usbkey > /dev/null > 2>&1"); + system("/bin/cp DSDT.* /usbkey > /dev/null 2>&1"); + system("/bin/umount /usbkey > /dev/null 2>&1"); devcount ++; } while (entry);