mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Backed out changeset e5e2ac9bb33b (bug 1530240) for causing build bustages in updatedefines.h CLOSED TREE

This commit is contained in:
Noemi Erli 2019-02-26 03:18:09 +02:00
Родитель a35fc1075a
Коммит f7fc71637d
3 изменённых файлов: 56 добавлений и 94 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

25
toolkit/mozapps/update/common/updatedefines.h
Просмотреть файл

@ -55,7 +55,18 @@
// The extra layer of indirection here allows this macro to be passed macros
# define NS_T(str) NS_CONCAT(L, str)
# define NS_SLASH NS_T('\\')
# define NS_tvsnprintf _vsnwprintf
static inline int mywcsprintf(WCHAR* dest, size_t count, const WCHAR* fmt,
...) {
size_t _count = count - 1;
va_list varargs;
va_start(varargs, fmt);
int result = _vsnwprintf(dest, count - 1, fmt, varargs);
va_end(varargs);
dest[_count] = L'\0';
return result;
}
# define NS_tsnprintf mywcsprintf
# define NS_taccess _waccess
# define NS_tatoi _wtoi64
# define NS_tchdir _wchdir
@ -103,7 +114,7 @@
# define LOG_S "%s"
# define NS_T(str) str
# define NS_SLASH NS_T('/')
# define NS_tvsnprintf vsnprintf
# define NS_tsnprintf snprintf
# define NS_taccess access
# define NS_tatoi atoi
# define NS_tchdir chdir
@ -134,14 +145,4 @@
#define BACKUP_EXT NS_T(".moz-backup")
static inline bool NS_tsnprintf(NS_tchar* dest, size_t count,
const NS_tchar* fmt, ...) {
va_list varargs;
va_start(varargs, fmt);
int result = NS_tvsnprintf(dest, count - 1, fmt, varargs);
va_end(varargs);
dest[count - 1] = NS_T('\0');
return result >= 0 && (size_t)result < count;
}
#endif

121
toolkit/mozapps/update/tests/TestAUSHelper.cpp
Просмотреть файл

@ -145,27 +145,19 @@ int NS_main(int argc, NS_tchar **argv) {
return 1;
}
#else
if (!NS_tsnprintf(exePath, sizeof(exePath) / sizeof(exePath[0]),
NS_T("%s"), argv[0])) {
return 1;
}
strcpy(exePath, argv[0]);
#endif
NS_tchar runFilePath[MAXPATHLEN];
if (!NS_tsnprintf(runFilePath,
sizeof(runFilePath) / sizeof(runFilePath[0]),
NS_T("%s.running"), exePath)) {
return 1;
}
NS_tsnprintf(runFilePath, sizeof(runFilePath) / sizeof(runFilePath[0]),
NS_T("%s.running"), exePath);
#ifdef XP_WIN
if (!NS_taccess(runFilePath, F_OK)) {
// This makes it possible to check if the post update process was
// launched twice which happens when the service performs an update.
NS_tchar runFilePathBak[MAXPATHLEN];
if (!NS_tsnprintf(runFilePathBak,
sizeof(runFilePathBak) / sizeof(runFilePathBak[0]),
NS_T("%s.bak"), runFilePath)) {
return 1;
}
NS_tsnprintf(runFilePathBak,
sizeof(runFilePathBak) / sizeof(runFilePathBak[0]),
NS_T("%s.bak"), runFilePath);
MoveFileExW(runFilePath, runFilePathBak, MOVEFILE_REPLACE_EXISTING);
}
#endif
@ -180,11 +172,8 @@ int NS_main(int argc, NS_tchar **argv) {
}
NS_tchar logFilePath[MAXPATHLEN];
if (!NS_tsnprintf(logFilePath,
sizeof(logFilePath) / sizeof(logFilePath[0]),
NS_T("%s.log"), exePath)) {
return 1;
}
NS_tsnprintf(logFilePath, sizeof(logFilePath) / sizeof(logFilePath[0]),
NS_T("%s.log"), exePath);
WriteMsg(logFilePath, "post-update");
return 0;
}
@ -247,24 +236,14 @@ int NS_main(int argc, NS_tchar **argv) {
if (!NS_tstrcmp(argv[1], NS_T("setup-symlink"))) {
#ifdef XP_UNIX
NS_tchar path[MAXPATHLEN];
if (!NS_tsnprintf(path, sizeof(path) / sizeof(path[0]), NS_T("%s/%s"),
NS_T("/tmp"), argv[2])) {
return 1;
}
if (mkdir(path, 0755)) {
return 1;
}
if (!NS_tsnprintf(path, sizeof(path) / sizeof(path[0]), NS_T("%s/%s/%s"),
NS_T("/tmp"), argv[2], argv[3])) {
return 1;
}
if (mkdir(path, 0755)) {
return 1;
}
if (!NS_tsnprintf(path, sizeof(path) / sizeof(path[0]), NS_T("%s/%s/%s/%s"),
NS_T("/tmp"), argv[2], argv[3], argv[4])) {
return 1;
}
NS_tsnprintf(path, sizeof(path) / sizeof(path[0]), NS_T("%s/%s"),
NS_T("/tmp"), argv[2]);
mkdir(path, 0755);
NS_tsnprintf(path, sizeof(path) / sizeof(path[0]), NS_T("%s/%s/%s"),
NS_T("/tmp"), argv[2], argv[3]);
mkdir(path, 0755);
NS_tsnprintf(path, sizeof(path) / sizeof(path[0]), NS_T("%s/%s/%s/%s"),
NS_T("/tmp"), argv[2], argv[3], argv[4]);
FILE *file = NS_tfopen(path, NS_T("w"));
if (file) {
NS_tfputs(NS_T("test"), file);
@ -273,14 +252,10 @@ int NS_main(int argc, NS_tchar **argv) {
if (symlink(path, argv[5]) != 0) {
return 1;
}
if (!NS_tsnprintf(path, sizeof(path) / sizeof(path[0]), NS_T("%s/%s"),
NS_T("/tmp"), argv[2])) {
return 1;
}
NS_tsnprintf(path, sizeof(path) / sizeof(path[0]), NS_T("%s/%s"),
NS_T("/tmp"), argv[2]);
if (argc > 6 && !NS_tstrcmp(argv[6], NS_T("change-perm"))) {
if (chmod(path, 0644)) {
return 1;
}
chmod(path, 0644);
}
return 0;
#else
@ -292,26 +267,18 @@ int NS_main(int argc, NS_tchar **argv) {
if (!NS_tstrcmp(argv[1], NS_T("remove-symlink"))) {
#ifdef XP_UNIX
NS_tchar path[MAXPATHLEN];
if (!NS_tsnprintf(path, sizeof(path) / sizeof(path[0]), NS_T("%s/%s"),
NS_T("/tmp"), argv[2])) {
return 1;
}
(void)chmod(path, 0755);
if (!NS_tsnprintf(path, sizeof(path) / sizeof(path[0]), NS_T("%s/%s/%s/%s"),
NS_T("/tmp"), argv[2], argv[3], argv[4])) {
return 1;
}
(void)unlink(path);
if (!NS_tsnprintf(path, sizeof(path) / sizeof(path[0]), NS_T("%s/%s/%s"),
NS_T("/tmp"), argv[2], argv[3])) {
return 1;
}
(void)rmdir(path);
if (!NS_tsnprintf(path, sizeof(path) / sizeof(path[0]), NS_T("%s/%s"),
NS_T("/tmp"), argv[2])) {
return 1;
}
(void)rmdir(path);
NS_tsnprintf(path, sizeof(path) / sizeof(path[0]), NS_T("%s/%s"),
NS_T("/tmp"), argv[2]);
chmod(path, 0755);
NS_tsnprintf(path, sizeof(path) / sizeof(path[0]), NS_T("%s/%s/%s/%s"),
NS_T("/tmp"), argv[2], argv[3], argv[4]);
unlink(path);
NS_tsnprintf(path, sizeof(path) / sizeof(path[0]), NS_T("%s/%s/%s"),
NS_T("/tmp"), argv[2], argv[3]);
rmdir(path);
NS_tsnprintf(path, sizeof(path) / sizeof(path[0]), NS_T("%s/%s"),
NS_T("/tmp"), argv[2]);
rmdir(path);
return 0;
#else
// Not implemented on non-Unix platforms
@ -322,9 +289,7 @@ int NS_main(int argc, NS_tchar **argv) {
if (!NS_tstrcmp(argv[1], NS_T("check-symlink"))) {
#ifdef XP_UNIX
struct stat ss;
if (lstat(argv[2], &ss)) {
return 1;
}
lstat(argv[2], &ss);
return S_ISLNK(ss.st_mode) ? 0 : 1;
#else
// Not implemented on non-Unix platforms
@ -419,15 +384,11 @@ int NS_main(int argc, NS_tchar **argv) {
// if buf (the 1st param) is NULL so free cwd when it is no longer needed.
NS_tchar *cwd = NS_tgetcwd(nullptr, 0);
NS_tchar inFilePath[MAXPATHLEN];
if (!NS_tsnprintf(inFilePath, sizeof(inFilePath) / sizeof(inFilePath[0]),
NS_T("%s/%s"), cwd, argv[2])) {
return 1;
}
NS_tsnprintf(inFilePath, sizeof(inFilePath) / sizeof(inFilePath[0]),
NS_T("%s/%s"), cwd, argv[2]);
NS_tchar outFilePath[MAXPATHLEN];
if (!NS_tsnprintf(outFilePath, sizeof(outFilePath) / sizeof(outFilePath[0]),
NS_T("%s/%s"), cwd, argv[3])) {
return 1;
}
NS_tsnprintf(outFilePath, sizeof(outFilePath) / sizeof(outFilePath[0]),
NS_T("%s/%s"), cwd, argv[3]);
free(cwd);
int seconds = NS_ttoi(argv[5]);
@ -465,14 +426,10 @@ int NS_main(int argc, NS_tchar **argv) {
{
// Command line argument test helper section
NS_tchar logFilePath[MAXPATHLEN];
if (!NS_tsnprintf(logFilePath, sizeof(logFilePath) / sizeof(logFilePath[0]),
NS_T("%s"), argv[2])) {
return 1;
}
NS_tsnprintf(logFilePath, sizeof(logFilePath) / sizeof(logFilePath[0]),
NS_T("%s"), argv[2]);
FILE *logFP = NS_tfopen(logFilePath, NS_T("wb"));
if (!logFP) {
return 1;
}
for (int i = 1; i < argc; ++i) {
fprintf(logFP, LOG_S "\n", argv[i]);
}

4
toolkit/mozapps/update/tests/moz.build
Просмотреть файл

@ -107,3 +107,7 @@ FINAL_TARGET_PP_FILES += [
with Files("browser/browser_TelemetryUpdatePing.js"):
BUG_COMPONENT = ("Toolkit", "Telemetry")
if CONFIG['CC_TYPE'] == 'gcc':
CXXFLAGS += ['-Wno-format-truncation']