提交 4d2c8223 编写于 作者: L Lv Zheng 提交者: Rafael J. Wysocki

ACPICA: OSL: Update acpidump to reduce source code differences

This patch is a result of an ACPICA commit to enables acpidump for EFI. For
Linux kernel, this patch is a no-op. It is only required by the ACPICA
release process to reduce the source code differences between the Linux
kernel and the ACPICA upstream. Lv Zheng.
Signed-off-by: NLv Zheng <lv.zheng@intel.com>
Signed-off-by: NBob Moore <robert.moore@intel.com>
Signed-off-by: NRafael J. Wysocki <rafael.j.wysocki@intel.com>
上级 846d6ef4
......@@ -44,6 +44,27 @@
#include "acpidump.h"
#include "acapps.h"
/* Local prototypes */
static int ap_is_existing_file(char *pathname);
static int ap_is_existing_file(char *pathname)
{
#ifndef _GNU_EFI
struct stat stat_info;
if (!stat(pathname, &stat_info)) {
acpi_log_error("Target path already exists, overwrite? [y|n] ");
if (getchar() != 'y') {
return (-1);
}
}
#endif
return 0;
}
/******************************************************************************
*
* FUNCTION: ap_open_output_file
......@@ -59,17 +80,12 @@
int ap_open_output_file(char *pathname)
{
struct stat stat_info;
ACPI_FILE file;
/* If file exists, prompt for overwrite */
if (!stat(pathname, &stat_info)) {
acpi_log_error("Target path already exists, overwrite? [y|n] ");
if (getchar() != 'y') {
return (-1);
}
if (ap_is_existing_file(pathname) != 0) {
return (-1);
}
/* Point stdout to the file */
......
......@@ -291,7 +291,11 @@ static int ap_do_options(int argc, char **argv)
*
******************************************************************************/
#ifndef _GNU_EFI
int ACPI_SYSTEM_XFACE main(int argc, char *argv[])
#else
int ACPI_SYSTEM_XFACE acpi_main(int argc, char *argv[])
#endif
{
int status = 0;
struct ap_dump_action *action;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册