diff options
| author | Jung-uk Kim <jkim@FreeBSD.org> | 2012-05-19 05:44:32 +0000 |
|---|---|---|
| committer | Jung-uk Kim <jkim@FreeBSD.org> | 2012-05-19 05:44:32 +0000 |
| commit | fa948a817cf9dae39dc632f9bf48a8af37244a0e (patch) | |
| tree | 83fbd480537714dcce335edc4aed3216f4e57816 /source/tools/acpiexec/aemain.c | |
| parent | b43c4dd5abdb09fe2e7f73f186586b962c9dc9f5 (diff) | |
| download | src-test2-fa948a817cf9dae39dc632f9bf48a8af37244a0e.tar.gz src-test2-fa948a817cf9dae39dc632f9bf48a8af37244a0e.zip | |
Notes
Diffstat (limited to 'source/tools/acpiexec/aemain.c')
| -rw-r--r-- | source/tools/acpiexec/aemain.c | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/source/tools/acpiexec/aemain.c b/source/tools/acpiexec/aemain.c index a5d519c1e178..d0e980b5a1fb 100644 --- a/source/tools/acpiexec/aemain.c +++ b/source/tools/acpiexec/aemain.c @@ -239,16 +239,20 @@ FlSplitInputPathname ( return (AE_NO_MEMORY); } - Substring = strrchr (DirectoryPath, '\\'); + /* Convert backslashes to slashes in the entire path */ + + UtConvertBackslashes (DirectoryPath); + + /* Backup to last slash or colon */ + + Substring = strrchr (DirectoryPath, '/'); if (!Substring) { - Substring = strrchr (DirectoryPath, '/'); - if (!Substring) - { - Substring = strrchr (DirectoryPath, ':'); - } + Substring = strrchr (DirectoryPath, ':'); } + /* Extract the simple filename */ + if (!Substring) { DirectoryPath[0] = 0; @@ -267,7 +271,6 @@ FlSplitInputPathname ( *OutDirectoryPath = DirectoryPath; *OutFilename = Filename; - return (AE_OK); } |