2006-03-03 Josh Stone <joshua.i.stone@intel.com>

	* main.cxx (main): search forward for dashes in the kernel release,
	to work properly with release names with more than one dash.
	* parse.cxx (eval_pp_conditional): ditto
	* tapsets.cxx (profile_derived_probe::profile_derived_probe): ditto
	* safety/safety.py (StaticSafety::__build_search_suffixes): ditto,
	and add copyright & GPL tag

1 files changed, 5 insertions, 4 deletions

diff --git a/main.cxx b/main.cxx
index 27e0cdd4..8088c65b 100644
--- a/main.cxx
+++ b/main.cxx
@@ -1,6 +1,7 @@
 // systemtap translator/driver
 // Copyright (C) 2005-2006 Red Hat Inc.
 // Copyright (C) 2005 IBM Corp.
+// Copyright (C) 2006 Intel Corporation.
 //
 // This file is part of systemtap, and is free software.  You can
 // redistribute it and/or modify it under the terms of the GNU General
@@ -318,10 +319,10 @@ main (int argc, char * const argv [])
   version_suffixes.push_back ("/" + kvr + "/" + arch);
   version_suffixes.push_back ("/" + kvr);
   // add kernel version (2.6.NN) + arch
-  string::size_type dash_rindex = kvr.rfind ('-');
-  if (dash_rindex > 0 && dash_rindex != string::npos) {
-    version_suffixes.push_back ("/" + kvr.substr (0, dash_rindex) + "/" + arch);
-    version_suffixes.push_back ("/" + kvr.substr (0, dash_rindex));
+  string::size_type dash_index = kvr.find ('-');
+  if (dash_index > 0 && dash_index != string::npos) {
+    version_suffixes.push_back ("/" + kvr.substr (0, dash_index) + "/" + arch);
+    version_suffixes.push_back ("/" + kvr.substr (0, dash_index));
   }
   // add kernel family (2.6) + arch
   string::size_type dot_index = kvr.find ('.');