mirror of
https://github.com/RGBCube/serenity
synced 2025-07-25 18:17:44 +00:00
Userland+Terminal: Port to new CArgsParser API
While at it, also add some niceties and fix some things.
This commit is contained in:
parent
9276582535
commit
f983dfe319
22 changed files with 392 additions and 653 deletions
|
@ -25,81 +25,32 @@
|
|||
*/
|
||||
|
||||
#include <AK/String.h>
|
||||
#include <LibCore/CArgsParser.h>
|
||||
#include <LibGUI/GApplication.h>
|
||||
#include <LibGUI/GClipboard.h>
|
||||
#include <getopt.h>
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
|
||||
struct Options {
|
||||
bool print_type { false };
|
||||
bool no_newline { false };
|
||||
};
|
||||
|
||||
void print_usage(FILE* stream, const char* argv0)
|
||||
{
|
||||
fprintf(
|
||||
stream,
|
||||
"Usage:\n"
|
||||
"\t%s [--print-type] [--no-newline]\n"
|
||||
"\n"
|
||||
"\t--print-type\t\tDisplay the copied type.\n"
|
||||
"\t-n, --no-newline\tDo not append a newline.\n"
|
||||
"\t-h, --help\t\tPrint this help message.\n",
|
||||
argv0);
|
||||
}
|
||||
|
||||
Options parse_options(int argc, char* argv[])
|
||||
{
|
||||
Options options;
|
||||
|
||||
static struct option long_options[] = {
|
||||
{ "print-type", no_argument, 0, 'p' },
|
||||
{ "no-newline", no_argument, 0, 'n' },
|
||||
{ "help", no_argument, 0, 'h' },
|
||||
{ 0, 0, 0, 0 }
|
||||
};
|
||||
while (true) {
|
||||
int option_index;
|
||||
int c = getopt_long(argc, argv, "hn", long_options, &option_index);
|
||||
if (c == -1)
|
||||
break;
|
||||
if (c == 0)
|
||||
c = long_options[option_index].val;
|
||||
|
||||
switch (c) {
|
||||
case 'p':
|
||||
options.print_type = true;
|
||||
break;
|
||||
case 'n':
|
||||
options.no_newline = true;
|
||||
break;
|
||||
case 'h':
|
||||
print_usage(stdout, argv[0]);
|
||||
exit(0);
|
||||
default:
|
||||
print_usage(stderr, argv[0]);
|
||||
exit(1);
|
||||
}
|
||||
}
|
||||
|
||||
return options;
|
||||
}
|
||||
|
||||
int main(int argc, char* argv[])
|
||||
{
|
||||
GApplication app(argc, argv);
|
||||
bool print_type = false;
|
||||
bool no_newline = false;
|
||||
|
||||
Options options = parse_options(argc, argv);
|
||||
CArgsParser args_parser;
|
||||
args_parser.add_option(print_type, "Display the copied type", "print-type", 0);
|
||||
args_parser.add_option(no_newline, "Do not append a newline", "no-newline", 'n');
|
||||
args_parser.parse(argc, argv);
|
||||
|
||||
GApplication app(argc, argv);
|
||||
|
||||
GClipboard& clipboard = GClipboard::the();
|
||||
auto data_and_type = clipboard.data_and_type();
|
||||
|
||||
if (!options.print_type) {
|
||||
if (!print_type) {
|
||||
printf("%s", data_and_type.data.characters());
|
||||
// Append a newline to text contents, but
|
||||
// only if we're not asked not to do this.
|
||||
if (data_and_type.type == "text" && !options.no_newline)
|
||||
if (data_and_type.type == "text" && !no_newline)
|
||||
putchar('\n');
|
||||
} else {
|
||||
printf("%s\n", data_and_type.type.characters());
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue