JehanneOS/newlib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

* Align usage output, version output, as well as usage and version

Browse Source 
option handling to use the same style throughout all Cygwin utils.
	Throughout use program_invocation_short_name to refer to current
	process name in Cygwin executables.
	* utils.sgml: Align documentation to above change.  Add missing
	sections for getconf, ldd, and setmetamode.
	* strace.cc (proc_child): Avoid compiler warning.
This commit is contained in:
Corinna Vinschen
2011-10-10 14:57:48 +00:00
parent 4fc8a5c90a
commit 92b499acff
21 changed files with 687 additions and 611 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
winsup/utils/ssp.c
View File

@@ -1,5 +1,5 @@
/*
* Copyright (c) 2000, 2001, 2002, 2009 Red Hat, Inc.
* Copyright (c) 2000, 2001, 2002, 2009, 2011 Red Hat, Inc.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -13,6 +13,7 @@
*
*/
#include <errno.h>
#include <stdio.h>
#include <string.h>
#include <stdlib.h>
@@ -21,8 +22,8 @@
#include <ctype.h>
#include <windows.h>
#include <getopt.h>
#include <cygwin/version.h>
static const char version[] = "$Revision$";
static char *prog_name;
static struct option longopts[] =
@@ -650,6 +651,7 @@ usage (FILE * stream)
{
fprintf (stream , ""
"Usage: %s [options] low_pc high_pc command...\n"
"\n"
"Single-step profile COMMAND\n"
"\n"
" -c, --console-trace trace every EIP value to the console. *Lots* slower.\n"
@@ -798,7 +800,7 @@ usage (FILE * stream)
"spent in each dll the program used. No sense optimizing a function in\n"
"your program if most of the time is spent in the DLL.\n"
"\n"
"I usually use the -v, -s, and -l options:\n"
"Typically use the -v, -s, and -l options:\n"
"\n"
" ssp -v -s -l -d 0x61001000 0x61080000 hello.exe\n"
"\n");
@@ -810,24 +812,15 @@ usage (FILE * stream)
static void
print_version ()
{
const char *v = strchr (version, ':');
int len;
if (!v)
{
v = "?";
len = 1;
}
else
{
v += 2;
len = strchr (v, ' ') - v;
}
printf ("\
%s (cygwin) %.*s\n\
Single-Step Profiler\n\
Copyright 2000, 2001, 2002 Red Hat, Inc.\n\
Compiled on %s\n\
", prog_name, len, v, __DATE__);
printf ("ssp (cygwin) %d.%d.%d\n"
"Single-Step Profiler\n"
"Copyright (C) 2000 - %s Red Hat, Inc.\n"
"This is free software; see the source for copying conditions. There is NO\n"
"warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n",
CYGWIN_VERSION_DLL_MAJOR / 1000,
CYGWIN_VERSION_DLL_MAJOR % 1000,
CYGWIN_VERSION_DLL_MINOR,
strrchr (__DATE__, ' ') + 1);
}
int
@@ -839,13 +832,7 @@ main (int argc, char **argv)
setbuf (stdout, 0);
prog_name = strrchr (argv[0], '/');
if (prog_name == NULL)
prog_name = strrchr (argv[0], '\\');
if (prog_name == NULL)
prog_name = argv[0];
else
prog_name++;
prog_name = program_invocation_short_name;
while ((c = getopt_long (argc, argv, opts, longopts, NULL)) != EOF)
switch (c)
@@ -885,7 +872,8 @@ main (int argc, char **argv)
print_version ();
exit (0);
default:
usage (stderr);
fprintf (stderr, "Try `%s --help' for more information.\n", prog_name);
exit (1);
}
if ( (argc - optind) < 3 )