From 77a5c1f9949be4bdf3ebc6fb969debd68a9ebd27 Mon Sep 17 00:00:00 2001 From: jistone Date: Fri, 3 Mar 2006 18:37:33 +0000 Subject: 2006-03-03 Josh Stone * 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 --- main.cxx | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'main.cxx') 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 ('.'); -- cgit