f551ea0f63
stat on Windows fails with ENOENT when passed a path with a trailing slash or backslash, regardless of whether the target is actually a directory. Emulate the correct POSIX behavior by stripping trailing path separators and then checking if the target is a directory if successful. Bug: http://b/30481559 Bug: https://code.google.com/p/android/issues/detail?id=214633 Change-Id: I1d398d19a9bce1ecb3fdc4aabc31aa98c82c3f93 Test: Relevant adb_tests pass on Linux and Windows 10.
66 lines
1.9 KiB
C++
66 lines
1.9 KiB
C++
/*
|
|
* Copyright (C) 2016 The Android Open Source Project
|
|
*
|
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
* you may not use this file except in compliance with the License.
|
|
* You may obtain a copy of the License at
|
|
*
|
|
* http://www.apache.org/licenses/LICENSE-2.0
|
|
*
|
|
* Unless required by applicable law or agreed to in writing, software
|
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
* See the License for the specific language governing permissions and
|
|
* limitations under the License.
|
|
*/
|
|
|
|
#include "sysdeps/stat.h"
|
|
|
|
#include <errno.h>
|
|
#include <sys/stat.h>
|
|
#include <sys/types.h>
|
|
#include <unistd.h>
|
|
|
|
#include <string>
|
|
|
|
#include <android-base/utf8.h>
|
|
|
|
// Version of stat() that takes a UTF-8 path.
|
|
int adb_stat(const char* path, struct adb_stat* s) {
|
|
// This definition of wstat seems to be missing from <sys/stat.h>.
|
|
#if defined(_FILE_OFFSET_BITS) && (_FILE_OFFSET_BITS == 64)
|
|
#ifdef _USE_32BIT_TIME_T
|
|
#define wstat _wstat32i64
|
|
#else
|
|
#define wstat _wstat64
|
|
#endif
|
|
#else
|
|
// <sys/stat.h> has a function prototype for wstat() that should be available.
|
|
#endif
|
|
|
|
std::wstring path_wide;
|
|
if (!android::base::UTF8ToWide(path, &path_wide)) {
|
|
errno = ENOENT;
|
|
return -1;
|
|
}
|
|
|
|
// If the path has a trailing slash, stat will fail with ENOENT regardless of whether the path
|
|
// is a directory or not.
|
|
bool expected_directory = false;
|
|
while (*path_wide.rbegin() == u'/' || *path_wide.rbegin() == u'\\') {
|
|
path_wide.pop_back();
|
|
expected_directory = true;
|
|
}
|
|
|
|
struct adb_stat st;
|
|
int result = wstat(path_wide.c_str(), &st);
|
|
if (result == 0 && expected_directory) {
|
|
if (!S_ISDIR(st.st_mode)) {
|
|
errno = ENOTDIR;
|
|
return -1;
|
|
}
|
|
}
|
|
|
|
memcpy(s, &st, sizeof(st));
|
|
return result;
|
|
}
|