Sigurd Meldgaard
f3fe9dc3b3
This is a reland of 58860f4814
Original change's description:
> Improve handling of disable-dartdev-analytics
>
> This is second try of https://dart-review.googlesource.com/c/sdk/+/171284
> that was reverted to to faulty logic in main_options.
>
> Some other refactorings are piggy-backed along.
>
> TestProject.runSync no longer takes a 'command' argument. It was anyway
> often not an argument.
>
> Also stop the messy handling of pub arguments. It is no longer needed.
>
> BUG: https://github.com/dart-lang/sdk/issues/44135
> Change-Id: I49abf5810d9ea262409ba9d93f0471037cb8a753
> TEST=The VM change is tested via all the pkg/dartdev/test/command/* tests that invoke dart with the --no-analytics flag.
> TEST=Furthermore manual test that the --no-analytics flag is passed to dartdev.
> Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/174261
> Reviewed-by: Jonas Jensen <jonasfj@google.com>
> Commit-Queue: Sigurd Meldgaard <sigurdm@google.com>
Change-Id: I725662f578d061f87171ceffe9aff3de83688f58
TEST=Furthermore run the vm-kernel-precomp-obfuscate-linux-release-x64-try trybot
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/174473
Commit-Queue: Sigurd Meldgaard <sigurdm@google.com>
Reviewed-by: Jonas Jensen <jonasfj@google.com>
100 lines
2.7 KiB
C++
100 lines
2.7 KiB
C++
// Copyright (c) 2017, the Dart project authors. Please see the AUTHORS file
|
|
// for details. All rights reserved. Use of this source code is governed by a
|
|
// BSD-style license that can be found in the LICENSE file.
|
|
|
|
#include "bin/options.h"
|
|
|
|
namespace dart {
|
|
namespace bin {
|
|
|
|
OptionProcessor* OptionProcessor::first_ = NULL;
|
|
|
|
bool OptionProcessor::IsValidFlag(const char* name) {
|
|
return name[0] == '-' && name[1] == '-' && name[2] != '\0';
|
|
}
|
|
|
|
bool OptionProcessor::IsValidShortFlag(const char* name) {
|
|
return name[0] == '-' && name[1] != '\0';
|
|
}
|
|
|
|
const char* OptionProcessor::ProcessOption(const char* option,
|
|
const char* name) {
|
|
const intptr_t length = strlen(name);
|
|
for (intptr_t i = 0; i < length; i++) {
|
|
if (option[i] != name[i]) {
|
|
if ((name[i] == '_') && (option[i] == '-')) {
|
|
continue;
|
|
}
|
|
return NULL;
|
|
}
|
|
}
|
|
return option + length;
|
|
}
|
|
|
|
bool OptionProcessor::TryProcess(const char* option,
|
|
CommandLineOptions* vm_options) {
|
|
for (OptionProcessor* p = first_; p != NULL; p = p->next_) {
|
|
if (p->Process(option, vm_options)) {
|
|
return true;
|
|
}
|
|
}
|
|
return false;
|
|
}
|
|
|
|
bool OptionProcessor::ProcessEnvironmentOption(
|
|
const char* arg,
|
|
CommandLineOptions* vm_options,
|
|
dart::SimpleHashMap** environment) {
|
|
ASSERT(arg != NULL);
|
|
ASSERT(environment != NULL);
|
|
if (*arg == '\0') {
|
|
return false;
|
|
}
|
|
if (*arg != '-') {
|
|
return false;
|
|
}
|
|
if (*(arg + 1) != 'D') {
|
|
return false;
|
|
}
|
|
arg = arg + 2;
|
|
if (*arg == '\0') {
|
|
return true;
|
|
}
|
|
if (*environment == NULL) {
|
|
*environment = new SimpleHashMap(&SimpleHashMap::SameStringValue, 4);
|
|
}
|
|
// Split the name=value part of the -Dname=value argument.
|
|
char* name;
|
|
char* value = NULL;
|
|
const char* equals_pos = strchr(arg, '=');
|
|
if (equals_pos == NULL) {
|
|
// No equal sign (name without value) currently not supported.
|
|
Syslog::PrintErr("No value given to -D option\n");
|
|
return true;
|
|
}
|
|
int name_len = equals_pos - arg;
|
|
if (name_len == 0) {
|
|
Syslog::PrintErr("No name given to -D option\n");
|
|
return true;
|
|
}
|
|
// Split name=value into name and value.
|
|
name = reinterpret_cast<char*>(malloc(name_len + 1));
|
|
strncpy(name, arg, name_len);
|
|
name[name_len] = '\0';
|
|
value = Utils::StrDup(equals_pos + 1);
|
|
SimpleHashMap::Entry* entry =
|
|
(*environment)
|
|
->Lookup(GetHashmapKeyFromString(name),
|
|
SimpleHashMap::StringHash(name), true);
|
|
ASSERT(entry != NULL); // Lookup adds an entry if key not found.
|
|
if (entry->value != NULL) {
|
|
free(name);
|
|
free(entry->value);
|
|
}
|
|
entry->value = value;
|
|
return true;
|
|
}
|
|
|
|
} // namespace bin
|
|
} // namespace dart
|