regenerate examples index in testsuite/systemtap.examples

[systemtap.git] / staplog.c

diff --git a/staplog.c b/staplog.c
index 670f0325436d321882fde864a069478f5b9432d4..5eecdbd721b29e95301de4e66df5855381316ef3 100644 (file)
--- a/staplog.c
+++ b/staplog.c
@@ -1,7 +1,7 @@
 /*
  crash shared object for retrieving systemtap buffer
  Copyright (c) 2007, Hitachi, Ltd.,
- Copyright (C) 2009, Red Hat Inc.
+ Copyright (C) 2009-2011, Red Hat Inc.
  Created by Satoru Moriya <satoru.moriya.br@hitachi.com>
  Updated by Masami Hiramatsu <mhiramat@redhat.com>
 
@@ -22,29 +22,34 @@
 
 /* crash/defs.h defines NR_CPUS based upon architecture macros
    X86, X86_64, etc.  See crash/configure.c (!). */
-#ifdef __alpha__
+#if !defined(X86) && !defined(X86_64) && !defined(ALPHA) && !defined(PPC) && \
+    !defined(IA64) && !defined(PPC64) && !defined(S390) && !defined(S390X) && \
+    !defined(ARM) && !defined(ARM64)
+
+#if defined(__alpha__)
 #define ALPHA
-#endif
-#ifdef __i386__
+#elif defined(__x86_64__)
+#define X86_64
+#elif defined(__i386__)
 #define X86
-#endif
-#ifdef __powerpc__
+#elif defined(__powerpc64__)
+#define PPC64
+#elif defined(__powerpc__)
 #define PPC
-#endif
-#ifdef __ia64__
+#elif defined(__ia64__)
 #define IA64
-#endif
-#ifdef __s390__
-#define S390
-#endif
-#ifdef __s390x__
+#elif defined(__s390x__)
 #define S390X
+#elif defined(__s390__)
+#define S390
+#elif defined(__aarch64__)
+#define ARM64
+#elif defined(__arm__)
+#define ARM
+#else
+#warn "unknown architecture for crash/staplog support"
 #endif
-#ifdef __powerpc64__
-#define PPC64
-#endif
-#ifdef __x86_64__
-#define X86_64
+
 #endif
 
 #include <crash/defs.h>
@@ -426,7 +431,7 @@ static void output_cpu_logs(char *dirname)
                 * probe record is written at that time.
                 */
                if (retrieve_all == 1 && start != 0) {
-                       strncat(fname, ".may_broken", MAX_FNAME);
+                       strncat(fname, ".may_broken", MAX_FNAME - 1);
                        fprintf(fp, "--- generating '%s/%s' ---\n", dirname, fname);
                        fprintf(fp, "  read subbuf %ld(%ld) (offset:%ld-%ld)\n",
                                (long)start-1,
@@ -489,6 +494,7 @@ void cmd_staplog(void)
                dirname = module;
 
        setup_global_data(module);
+       assert(dirname);
        output_cpu_logs(dirname);
        return;
 }