diff options
| author | Steve Kondik <shade@chemlab.org> | 2012-11-18 15:47:18 -0800 |
|---|---|---|
| committer | Steve Kondik <shade@chemlab.org> | 2012-11-18 15:47:18 -0800 |
| commit | a546c7006355a7bd1df4267ee53d0bfa2c017c8c (patch) | |
| tree | 01be0bf6c0d6968e1468ec9661fd52110f9b05a7 /android/utils/path.c | |
| parent | baf3d7830396202df5cc47bd7bcee109c319cdb3 (diff) | |
| parent | 0f809250987b64f491bd3b4b73c0f0d33036a786 (diff) | |
| download | external_qemu-a546c7006355a7bd1df4267ee53d0bfa2c017c8c.zip external_qemu-a546c7006355a7bd1df4267ee53d0bfa2c017c8c.tar.gz external_qemu-a546c7006355a7bd1df4267ee53d0bfa2c017c8c.tar.bz2 | |
Merge branch 'jb-mr1-release' of https://android.googlesource.com/platform/external/qemu into mr1-staging
Change-Id: I8a4a71ac65b08e6e17f26c942f67a15b85211115
Diffstat (limited to 'android/utils/path.c')
| -rw-r--r-- | android/utils/path.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/android/utils/path.c b/android/utils/path.c index 1bcdc4e..3e9d97b 100644 --- a/android/utils/path.c +++ b/android/utils/path.c @@ -78,8 +78,12 @@ path_parent( const char* path, int levels ) while (base > path && !ispathsep(base[-1])) base--; - if (base <= path) /* we can't go that far */ + if (base <= path) { + if (end == base+1 && base[0] == '.' && levels == 1) + return strdup(".."); + /* we can't go that far */ return NULL; + } if (end == base+1 && base[0] == '.') goto Next; |