Menu
▾
▴
[oprof-cvs] CVS: oprofile/utils opcontrol, 1.140.2.2, 1.140.2.3 ophelp.c, 1.19, 1.19.2.1
|
From: Maynard J. <may...@us...> - 2007-10-18 17:57:32
|
Update of /cvsroot/oprofile/oprofile/utils In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv19065/utils Modified Files: Tag: JIT_SUPPORT opcontrol ophelp.c Log Message: Sync JIT_SUPPORT branch with HEAD Index: opcontrol =================================================================== RCS file: /cvsroot/oprofile/oprofile/utils/opcontrol,v retrieving revision 1.140.2.2 retrieving revision 1.140.2.3 diff -u -p -d -r1.140.2.2 -r1.140.2.3 --- opcontrol 4 Oct 2007 21:42:36 -0000 1.140.2.2 +++ opcontrol 18 Oct 2007 17:56:59 -0000 1.140.2.3 @@ -1734,15 +1734,25 @@ check_version do_init if test `id -u` != "0"; then - if test "$1" = "--dump" -a -z "$2"; then - ONLY_DUMP=yes - do_dump - exit 0; - elif test "$1" = "--list-events" -a -z "$2"; then - exec $OPHELP + if test -z "$2"; then + case "$1" in + --dump|-d) + ONLY_DUMP=yes + do_dump + exit 0; + ;; + --list-events|-l) + exec $OPHELP + exit 0; + ;; + *) + echo "Normal users are limited to either '--dump' or '--list-events'." >&2 + exit 1 + ;; + esac else - echo "Normal users are limited to either '--dump' or '--list-events'." >&2 - exit 1 + echo "Normal users are limited to either '--dump' or '--list-events'." >&2 + exit 1 fi fi Index: ophelp.c =================================================================== RCS file: /cvsroot/oprofile/oprofile/utils/ophelp.c,v retrieving revision 1.19 retrieving revision 1.19.2.1 diff -u -p -d -r1.19 -r1.19.2.1 --- ophelp.c 13 Jun 2007 15:04:13 -0000 1.19 +++ ophelp.c 18 Oct 2007 17:56:59 -0000 1.19.2.1 @@ -417,7 +417,7 @@ int main(int argc, char const * argv[]) case CPU_AXP_EV6: case CPU_AXP_EV67: printf("See Alpha Architecture Reference Manual\n" - "ftp://ftp.compaq.com/pub/products/alphaCPUdocs/alpha_arch_ref.pdf\n"); + "http://download.majix.org/dec/alpha_arch_ref.pdf\n"); break; case CPU_ARM_XSCALE1: case CPU_ARM_XSCALE2: |