1*96ccc8cbSesaxe#!/usr/sfw/bin/python 2*96ccc8cbSesaxe# 3*96ccc8cbSesaxe# CDDL HEADER START 4*96ccc8cbSesaxe# 5*96ccc8cbSesaxe# The contents of this file are subject to the terms of the 6*96ccc8cbSesaxe# Common Development and Distribution License (the "License"). 7*96ccc8cbSesaxe# You may not use this file except in compliance with the License. 8*96ccc8cbSesaxe# 9*96ccc8cbSesaxe# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE 10*96ccc8cbSesaxe# or http://www.opensolaris.org/os/licensing. 11*96ccc8cbSesaxe# See the License for the specific language governing permissions 12*96ccc8cbSesaxe# and limitations under the License. 13*96ccc8cbSesaxe# 14*96ccc8cbSesaxe# When distributing Covered Code, include this CDDL HEADER in each 15*96ccc8cbSesaxe# file and include the License file at usr/src/OPENSOLARIS.LICENSE. 16*96ccc8cbSesaxe# If applicable, add the following below this CDDL HEADER, with the 17*96ccc8cbSesaxe# fields enclosed by brackets "[]" replaced with your own identifying 18*96ccc8cbSesaxe# information: Portions Copyright [yyyy] [name of copyright owner] 19*96ccc8cbSesaxe# 20*96ccc8cbSesaxe# CDDL HEADER END 21*96ccc8cbSesaxe# 22*96ccc8cbSesaxe# Copyright 2006 Sun Microsystems, Inc. All rights reserved. 23*96ccc8cbSesaxe# Use is subject to license terms. 24*96ccc8cbSesaxe# 25*96ccc8cbSesaxe#ident "%Z%%M% %I% %E% SMI" 26*96ccc8cbSesaxe 27*96ccc8cbSesaxe# 28*96ccc8cbSesaxe# wsdiff(1) is a tool that can be used to determine which compiled objects 29*96ccc8cbSesaxe# have changed as a result of a given source change. Developers backporting 30*96ccc8cbSesaxe# new features, RFEs and bug fixes need to be able to identify the set of 31*96ccc8cbSesaxe# patch deliverables necessary for feature/fix realization on a patched system. 32*96ccc8cbSesaxe# 33*96ccc8cbSesaxe# The tool works by comparing objects in two trees/proto areas (one build with, 34*96ccc8cbSesaxe# and without the source changes. 35*96ccc8cbSesaxe# 36*96ccc8cbSesaxe# Using wsdiff(1) is fairly simple: 37*96ccc8cbSesaxe# - Bringover to a fresh workspace 38*96ccc8cbSesaxe# - Perform a full non-debug build (clobber if workspace isn't fresh) 39*96ccc8cbSesaxe# - Move the proto area aside, call it proto.old, or something. 40*96ccc8cbSesaxe# - Integrate your changes to the workspace 41*96ccc8cbSesaxe# - Perform another full non-debug clobber build. 42*96ccc8cbSesaxe# - Use wsdiff(1) to see what changed: 43*96ccc8cbSesaxe# $ wsdiff proto.old proto 44*96ccc8cbSesaxe# 45*96ccc8cbSesaxe# By default, wsdiff will print the list of changed objects / deliverables to 46*96ccc8cbSesaxe# stdout. If a results file is specified via -r, the list of differing objects, 47*96ccc8cbSesaxe# and details about why wsdiff(1) thinks they are different will be logged to 48*96ccc8cbSesaxe# the results file. 49*96ccc8cbSesaxe# 50*96ccc8cbSesaxe# By invoking nightly(1) with the -w option to NIGHTLY_FLAGS, nightly(1) will use 51*96ccc8cbSesaxe# wsdiff(1) to report on what objects changed since the last build. 52*96ccc8cbSesaxe# 53*96ccc8cbSesaxe# For patch deliverable purposes, it's advised to have nightly do a clobber, 54*96ccc8cbSesaxe# non-debug build. 55*96ccc8cbSesaxe# 56*96ccc8cbSesaxe# Think about the results. Was something flagged that you don't expect? Go look 57*96ccc8cbSesaxe# at the results file to see details about the differences. 58*96ccc8cbSesaxe# 59*96ccc8cbSesaxe# Use the -i option in conjunction with -v and -V to dive deeper and have wsdiff(1) 60*96ccc8cbSesaxe# report with more verbosity. 61*96ccc8cbSesaxe# 62*96ccc8cbSesaxe# Usage: wsdiff [-vVt] [-r results ] [-i filelist ] old new 63*96ccc8cbSesaxe# 64*96ccc8cbSesaxe# Where "old" is the path to the proto area build without the changes, and 65*96ccc8cbSesaxe# "new" is the path to the proto area built with the changes. The following 66*96ccc8cbSesaxe# options are supported: 67*96ccc8cbSesaxe# 68*96ccc8cbSesaxe# -v Do not truncate observed diffs in results 69*96ccc8cbSesaxe# -V Log *all* ELF sect diffs vs. logging the first diff found 70*96ccc8cbSesaxe# -t Use onbld tools in $SRC/tools 71*96ccc8cbSesaxe# -r Log results and observed differences 72*96ccc8cbSesaxe# -i Tell wsdiff which objects to compare via an input file list 73*96ccc8cbSesaxe 74*96ccc8cbSesaxeimport datetime, fnmatch, getopt, profile, os, popen2, commands 75*96ccc8cbSesaxeimport re, select, string, struct, sys, tempfile, time 76*96ccc8cbSesaxefrom stat import * 77*96ccc8cbSesaxe 78*96ccc8cbSesaxe# Human readable diffs truncated by default if longer than this 79*96ccc8cbSesaxe# Specifying -v on the command line will override 80*96ccc8cbSesaxediffs_sz_thresh = 4096 81*96ccc8cbSesaxe 82*96ccc8cbSesaxe# Default search path for wsdiff 83*96ccc8cbSesaxewsdiff_path = [ "/usr/bin", 84*96ccc8cbSesaxe "/usr/ccs/bin", 85*96ccc8cbSesaxe "/lib/svc/bin", 86*96ccc8cbSesaxe "/opt/onbld/bin" ] 87*96ccc8cbSesaxe 88*96ccc8cbSesaxe# These are objects that wsdiff will notice look different, but will not report. 89*96ccc8cbSesaxe# Existence of an exceptions list, and adding things here is *dangerous*, 90*96ccc8cbSesaxe# and therefore the *only* reasons why anything would be listed here is because 91*96ccc8cbSesaxe# the objects do not build deterministically, yet we *cannot* fix this. 92*96ccc8cbSesaxe# 93*96ccc8cbSesaxe# These perl libraries use __DATE__ and therefore always look different. 94*96ccc8cbSesaxe# Ideally, we would purge use the use of __DATE__ from the source, but because 95*96ccc8cbSesaxe# this is source we wish to distribute with Solaris "unchanged", we cannot modify. 96*96ccc8cbSesaxe# 97*96ccc8cbSesaxewsdiff_exceptions = [ "usr/perl5/5.8.4/lib/sun4-solaris-64int/CORE/libperl.so.1", 98*96ccc8cbSesaxe "usr/perl5/5.6.1/lib/sun4-solaris-64int/CORE/libperl.so.1", 99*96ccc8cbSesaxe "usr/perl5/5.8.4/lib/i86pc-solaris-64int/CORE/libperl.so.1", 100*96ccc8cbSesaxe "usr/perl5/5.6.1/lib/i86pc-solaris-64int/CORE/libperl.so.1" 101*96ccc8cbSesaxe ] 102*96ccc8cbSesaxe 103*96ccc8cbSesaxe##### 104*96ccc8cbSesaxe# Logging routines 105*96ccc8cbSesaxe# 106*96ccc8cbSesaxe 107*96ccc8cbSesaxe# Informational message to be printed to the screen, and the log file 108*96ccc8cbSesaxedef info(msg) : 109*96ccc8cbSesaxe 110*96ccc8cbSesaxe print >> sys.stdout, msg 111*96ccc8cbSesaxe if logging : 112*96ccc8cbSesaxe print >> log, msg 113*96ccc8cbSesaxe sys.stdout.flush() 114*96ccc8cbSesaxe 115*96ccc8cbSesaxe# Error message to be printed to the screen, and the log file 116*96ccc8cbSesaxedef error(msg) : 117*96ccc8cbSesaxe 118*96ccc8cbSesaxe print >> sys.stderr, "ERROR:", msg 119*96ccc8cbSesaxe sys.stderr.flush() 120*96ccc8cbSesaxe if logging : 121*96ccc8cbSesaxe print >> log, "ERROR:", msg 122*96ccc8cbSesaxe log.flush() 123*96ccc8cbSesaxe 124*96ccc8cbSesaxe# Informational message to be printed only to the log, if there is one. 125*96ccc8cbSesaxedef v_info(msg) : 126*96ccc8cbSesaxe 127*96ccc8cbSesaxe if logging : 128*96ccc8cbSesaxe print >> log, msg 129*96ccc8cbSesaxe log.flush() 130*96ccc8cbSesaxe 131*96ccc8cbSesaxe# 132*96ccc8cbSesaxe# Flag a detected file difference 133*96ccc8cbSesaxe# Display the fileName to stdout, and log the difference 134*96ccc8cbSesaxe# 135*96ccc8cbSesaxedef difference(f, dtype, diffs) : 136*96ccc8cbSesaxe 137*96ccc8cbSesaxe if f in wsdiff_exceptions : 138*96ccc8cbSesaxe return 139*96ccc8cbSesaxe 140*96ccc8cbSesaxe print >> sys.stdout, f 141*96ccc8cbSesaxe sys.stdout.flush() 142*96ccc8cbSesaxe 143*96ccc8cbSesaxe log_difference(f, dtype, diffs) 144*96ccc8cbSesaxe 145*96ccc8cbSesaxe# 146*96ccc8cbSesaxe# Do the actual logging of the difference to the results file 147*96ccc8cbSesaxe# 148*96ccc8cbSesaxedef log_difference(f, dtype, diffs) : 149*96ccc8cbSesaxe if logging : 150*96ccc8cbSesaxe print >> log, f 151*96ccc8cbSesaxe print >> log, "NOTE:", dtype, "difference detected." 152*96ccc8cbSesaxe 153*96ccc8cbSesaxe difflen = len(diffs) 154*96ccc8cbSesaxe if difflen > 0 : 155*96ccc8cbSesaxe print >> log 156*96ccc8cbSesaxe 157*96ccc8cbSesaxe if not vdiffs and difflen > diffs_sz_thresh : 158*96ccc8cbSesaxe print >> log, diffs[:diffs_sz_thresh] 159*96ccc8cbSesaxe print >> log, \ 160*96ccc8cbSesaxe "... truncated due to length: " \ 161*96ccc8cbSesaxe "use -v to override ..." 162*96ccc8cbSesaxe else : 163*96ccc8cbSesaxe print >> log, diffs 164*96ccc8cbSesaxe print >> log, "\n" 165*96ccc8cbSesaxe log.flush() 166*96ccc8cbSesaxe 167*96ccc8cbSesaxe 168*96ccc8cbSesaxe##### 169*96ccc8cbSesaxe# diff generating routines 170*96ccc8cbSesaxe# 171*96ccc8cbSesaxe 172*96ccc8cbSesaxe# 173*96ccc8cbSesaxe# Return human readable diffs from two temporary files 174*96ccc8cbSesaxe# 175*96ccc8cbSesaxedef diffFileData(tmpf1, tmpf2) : 176*96ccc8cbSesaxe 177*96ccc8cbSesaxe # Filter the data through od(1) if the data is detected 178*96ccc8cbSesaxe # as being binary 179*96ccc8cbSesaxe if isBinary(tmpf1) or isBinary(tmpf2) : 180*96ccc8cbSesaxe tmp_od1 = tmpf1 + ".od" 181*96ccc8cbSesaxe tmp_od2 = tmpf2 + ".od" 182*96ccc8cbSesaxe 183*96ccc8cbSesaxe cmd = od_cmd + " -c -t x4" + " " + tmpf1 + " > " + tmp_od1 184*96ccc8cbSesaxe os.system(cmd) 185*96ccc8cbSesaxe cmd = od_cmd + " -c -t x4" + " " + tmpf2 + " > " + tmp_od2 186*96ccc8cbSesaxe os.system(cmd) 187*96ccc8cbSesaxe 188*96ccc8cbSesaxe tmpf1 = tmp_od1 189*96ccc8cbSesaxe tmpf2 = tmp_od2 190*96ccc8cbSesaxe 191*96ccc8cbSesaxe data = commands.getoutput(diff_cmd + " " + tmpf1 + " " + tmpf2) 192*96ccc8cbSesaxe 193*96ccc8cbSesaxe return data 194*96ccc8cbSesaxe 195*96ccc8cbSesaxe# 196*96ccc8cbSesaxe# Return human readable diffs betweeen two datasets 197*96ccc8cbSesaxe# 198*96ccc8cbSesaxedef diffData(d1, d2) : 199*96ccc8cbSesaxe 200*96ccc8cbSesaxe global tmpFile1 201*96ccc8cbSesaxe global tmpFile2 202*96ccc8cbSesaxe 203*96ccc8cbSesaxe try: 204*96ccc8cbSesaxe fd1 = open(tmpFile1, "w") 205*96ccc8cbSesaxe except: 206*96ccc8cbSesaxe error("failed to open: " + tmpFile1) 207*96ccc8cbSesaxe cleanup(1) 208*96ccc8cbSesaxe try: 209*96ccc8cbSesaxe fd2 = open(tmpFile2, "w") 210*96ccc8cbSesaxe except: 211*96ccc8cbSesaxe error("failed to open: " + tmpFile2) 212*96ccc8cbSesaxe cleanup(1) 213*96ccc8cbSesaxe 214*96ccc8cbSesaxe fd1.write(d1) 215*96ccc8cbSesaxe fd2.write(d2) 216*96ccc8cbSesaxe fd1.close() 217*96ccc8cbSesaxe fd2.close() 218*96ccc8cbSesaxe 219*96ccc8cbSesaxe return diffFileData(tmpFile1, tmpFile2) 220*96ccc8cbSesaxe 221*96ccc8cbSesaxe##### 222*96ccc8cbSesaxe# Misc utility functions 223*96ccc8cbSesaxe# 224*96ccc8cbSesaxe 225*96ccc8cbSesaxe# Prune off the leading prefix from string s 226*96ccc8cbSesaxedef str_prefix_trunc(s, prefix) : 227*96ccc8cbSesaxe snipLen = len(prefix) 228*96ccc8cbSesaxe return s[snipLen:] 229*96ccc8cbSesaxe 230*96ccc8cbSesaxe# 231*96ccc8cbSesaxe# Prune off leading proto path goo (if there is one) to yield 232*96ccc8cbSesaxe# the deliverable's eventual path relative to root 233*96ccc8cbSesaxe# e.g. proto.base/root_sparc/usr/src/cmd/prstat => usr/src/cmd/prstat 234*96ccc8cbSesaxe# 235*96ccc8cbSesaxedef fnFormat(fn) : 236*96ccc8cbSesaxe root_arch_str = "root_" + arch 237*96ccc8cbSesaxe 238*96ccc8cbSesaxe pos = fn.find(root_arch_str) 239*96ccc8cbSesaxe if pos == -1 : 240*96ccc8cbSesaxe return fn 241*96ccc8cbSesaxe 242*96ccc8cbSesaxe pos = fn.find("/", pos) 243*96ccc8cbSesaxe if pos == -1 : 244*96ccc8cbSesaxe return fn 245*96ccc8cbSesaxe 246*96ccc8cbSesaxe return fn[pos + 1:] 247*96ccc8cbSesaxe 248*96ccc8cbSesaxe##### 249*96ccc8cbSesaxe# Usage / argument processing 250*96ccc8cbSesaxe# 251*96ccc8cbSesaxe 252*96ccc8cbSesaxe# 253*96ccc8cbSesaxe# Display usage message 254*96ccc8cbSesaxe# 255*96ccc8cbSesaxedef usage() : 256*96ccc8cbSesaxe sys.stdout.flush() 257*96ccc8cbSesaxe print >> sys.stderr, """Usage: wsdiff [-vVt] [-r results ] [-i filelist ] old new 258*96ccc8cbSesaxe -v Do not truncate observed diffs in results 259*96ccc8cbSesaxe -V Log *all* ELF sect diffs vs. logging the first diff found 260*96ccc8cbSesaxe -t Use onbld tools in $SRC/tools 261*96ccc8cbSesaxe -r Log results and observed differences 262*96ccc8cbSesaxe -i Tell wsdiff which objects to compare via an input file list""" 263*96ccc8cbSesaxe sys.exit(1) 264*96ccc8cbSesaxe 265*96ccc8cbSesaxe# 266*96ccc8cbSesaxe# Process command line options 267*96ccc8cbSesaxe# 268*96ccc8cbSesaxedef args() : 269*96ccc8cbSesaxe 270*96ccc8cbSesaxe global logging 271*96ccc8cbSesaxe global vdiffs 272*96ccc8cbSesaxe global reportAllSects 273*96ccc8cbSesaxe 274*96ccc8cbSesaxe validOpts = 'i:r:vVt?' 275*96ccc8cbSesaxe 276*96ccc8cbSesaxe baseRoot = "" 277*96ccc8cbSesaxe ptchRoot = "" 278*96ccc8cbSesaxe fileNamesFile = "" 279*96ccc8cbSesaxe results = "" 280*96ccc8cbSesaxe localTools = False 281*96ccc8cbSesaxe 282*96ccc8cbSesaxe # getopt.getopt() returns: 283*96ccc8cbSesaxe # an option/value tuple 284*96ccc8cbSesaxe # a list of remaining non-option arguments 285*96ccc8cbSesaxe # 286*96ccc8cbSesaxe # A correct wsdiff invocation will have exactly two non option 287*96ccc8cbSesaxe # arguments, the paths to the base (old), ptch (new) proto areas 288*96ccc8cbSesaxe try: 289*96ccc8cbSesaxe optlist, args = getopt.getopt(sys.argv[1:], validOpts) 290*96ccc8cbSesaxe except getopt.error, val: 291*96ccc8cbSesaxe usage() 292*96ccc8cbSesaxe 293*96ccc8cbSesaxe if len(args) != 2 : 294*96ccc8cbSesaxe usage(); 295*96ccc8cbSesaxe 296*96ccc8cbSesaxe for opt,val in optlist : 297*96ccc8cbSesaxe if opt == '-i' : 298*96ccc8cbSesaxe fileNamesFile = val 299*96ccc8cbSesaxe elif opt == '-r' : 300*96ccc8cbSesaxe results = val 301*96ccc8cbSesaxe logging = True 302*96ccc8cbSesaxe elif opt == '-v' : 303*96ccc8cbSesaxe vdiffs = True 304*96ccc8cbSesaxe elif opt == '-V' : 305*96ccc8cbSesaxe reportAllSects = True 306*96ccc8cbSesaxe elif opt == '-t': 307*96ccc8cbSesaxe localTools = True 308*96ccc8cbSesaxe else: 309*96ccc8cbSesaxe usage() 310*96ccc8cbSesaxe 311*96ccc8cbSesaxe baseRoot = args[0] 312*96ccc8cbSesaxe ptchRoot = args[1] 313*96ccc8cbSesaxe 314*96ccc8cbSesaxe if len(baseRoot) == 0 or len(ptchRoot) == 0 : 315*96ccc8cbSesaxe usage() 316*96ccc8cbSesaxe 317*96ccc8cbSesaxe if logging and len(results) == 0 : 318*96ccc8cbSesaxe usage() 319*96ccc8cbSesaxe 320*96ccc8cbSesaxe if vdiffs and not logging : 321*96ccc8cbSesaxe error("The -v option requires a results file (-r)") 322*96ccc8cbSesaxe sys.exit(1) 323*96ccc8cbSesaxe 324*96ccc8cbSesaxe if reportAllSects and not logging : 325*96ccc8cbSesaxe error("The -V option requires a results file (-r)") 326*96ccc8cbSesaxe sys.exit(1) 327*96ccc8cbSesaxe 328*96ccc8cbSesaxe # alphabetical order 329*96ccc8cbSesaxe return baseRoot, fileNamesFile, localTools, ptchRoot, results 330*96ccc8cbSesaxe 331*96ccc8cbSesaxe##### 332*96ccc8cbSesaxe# File identification 333*96ccc8cbSesaxe# 334*96ccc8cbSesaxe 335*96ccc8cbSesaxe# 336*96ccc8cbSesaxe# Identify the file type. 337*96ccc8cbSesaxe# If it's not ELF, use the file extension to identify 338*96ccc8cbSesaxe# certain file types that require special handling to 339*96ccc8cbSesaxe# compare. Otherwise just return a basic "ASCII" type. 340*96ccc8cbSesaxe# 341*96ccc8cbSesaxedef getTheFileType(f) : 342*96ccc8cbSesaxe 343*96ccc8cbSesaxe extensions = { 'a' : 'ELF Object Archive', 344*96ccc8cbSesaxe 'jar' : 'Java Archive', 345*96ccc8cbSesaxe 'html' : 'HTML', 346*96ccc8cbSesaxe 'ln' : 'Lint Library', 347*96ccc8cbSesaxe 'db' : 'Sqlite Database' } 348*96ccc8cbSesaxe 349*96ccc8cbSesaxe if os.stat(f)[ST_SIZE] == 0 : 350*96ccc8cbSesaxe return 'ASCII' 351*96ccc8cbSesaxe 352*96ccc8cbSesaxe if isELF(f) == 1 : 353*96ccc8cbSesaxe return 'ELF' 354*96ccc8cbSesaxe 355*96ccc8cbSesaxe fnamelist = f.split('.') 356*96ccc8cbSesaxe if len(fnamelist) > 1 : # Test the file extension 357*96ccc8cbSesaxe extension = fnamelist[-1] 358*96ccc8cbSesaxe if extension in extensions.keys(): 359*96ccc8cbSesaxe return extensions[extension] 360*96ccc8cbSesaxe 361*96ccc8cbSesaxe return 'ASCII' 362*96ccc8cbSesaxe 363*96ccc8cbSesaxe# 364*96ccc8cbSesaxe# Return non-zero if "f" is an ELF file 365*96ccc8cbSesaxe# 366*96ccc8cbSesaxeelfmagic = '\177ELF' 367*96ccc8cbSesaxedef isELF(f) : 368*96ccc8cbSesaxe try: 369*96ccc8cbSesaxe fd = open(f) 370*96ccc8cbSesaxe except: 371*96ccc8cbSesaxe error("failed to open: " + f) 372*96ccc8cbSesaxe return 0 373*96ccc8cbSesaxe magic = fd.read(len(elfmagic)) 374*96ccc8cbSesaxe fd.close() 375*96ccc8cbSesaxe 376*96ccc8cbSesaxe if magic == elfmagic : 377*96ccc8cbSesaxe return 1 378*96ccc8cbSesaxe return 0 379*96ccc8cbSesaxe 380*96ccc8cbSesaxe# 381*96ccc8cbSesaxe# Return non-zero is "f" is binary. 382*96ccc8cbSesaxe# Consider the file to be binary if it contains any null characters 383*96ccc8cbSesaxe# 384*96ccc8cbSesaxedef isBinary(f) : 385*96ccc8cbSesaxe try: 386*96ccc8cbSesaxe fd = open(f) 387*96ccc8cbSesaxe except: 388*96ccc8cbSesaxe error("failed to open: " + f) 389*96ccc8cbSesaxe return 0 390*96ccc8cbSesaxe s = fd.read() 391*96ccc8cbSesaxe fd.close() 392*96ccc8cbSesaxe 393*96ccc8cbSesaxe if s.find('\0') == -1 : 394*96ccc8cbSesaxe return 0 395*96ccc8cbSesaxe else : 396*96ccc8cbSesaxe return 1 397*96ccc8cbSesaxe 398*96ccc8cbSesaxe##### 399*96ccc8cbSesaxe# Directory traversal and file finding 400*96ccc8cbSesaxe# 401*96ccc8cbSesaxe 402*96ccc8cbSesaxe# 403*96ccc8cbSesaxe# Return a sorted list of files found under the specified directory 404*96ccc8cbSesaxe# 405*96ccc8cbSesaxedef findFiles(d) : 406*96ccc8cbSesaxe for path, subdirs, files in os.walk(d) : 407*96ccc8cbSesaxe files.sort() 408*96ccc8cbSesaxe for name in files : 409*96ccc8cbSesaxe yield os.path.join(path, name) 410*96ccc8cbSesaxe 411*96ccc8cbSesaxe# 412*96ccc8cbSesaxe# Examine all files in base, ptch 413*96ccc8cbSesaxe# 414*96ccc8cbSesaxe# Return a list of files appearing in both proto areas, 415*96ccc8cbSesaxe# a list of new files (files found only in ptch) and 416*96ccc8cbSesaxe# a list of deleted files (files found only in base) 417*96ccc8cbSesaxe# 418*96ccc8cbSesaxedef protoCatalog(base, ptch) : 419*96ccc8cbSesaxe compFiles = [] # List of files in both proto areas 420*96ccc8cbSesaxe ptchList = [] # List of file in patch proto area 421*96ccc8cbSesaxe 422*96ccc8cbSesaxe newFiles = [] # New files detected 423*96ccc8cbSesaxe deletedFiles = [] # Deleted files 424*96ccc8cbSesaxe 425*96ccc8cbSesaxe baseFilesList = list(findFiles(base)) 426*96ccc8cbSesaxe baseStringLength = len(base) 427*96ccc8cbSesaxe 428*96ccc8cbSesaxe ptchFilesList = list(findFiles(ptch)) 429*96ccc8cbSesaxe ptchStringLength = len(ptch) 430*96ccc8cbSesaxe 431*96ccc8cbSesaxe # Inventory files in the base proto area 432*96ccc8cbSesaxe for fn in baseFilesList : 433*96ccc8cbSesaxe if os.path.islink(fn) : 434*96ccc8cbSesaxe continue 435*96ccc8cbSesaxe 436*96ccc8cbSesaxe fileName = fn[baseStringLength:] 437*96ccc8cbSesaxe compFiles.append(fileName) 438*96ccc8cbSesaxe 439*96ccc8cbSesaxe # Inventory files in the patch proto area 440*96ccc8cbSesaxe for fn in ptchFilesList : 441*96ccc8cbSesaxe if os.path.islink(fn) : 442*96ccc8cbSesaxe continue 443*96ccc8cbSesaxe 444*96ccc8cbSesaxe fileName = fn[ptchStringLength:] 445*96ccc8cbSesaxe ptchList.append(fileName) 446*96ccc8cbSesaxe 447*96ccc8cbSesaxe # Deleted files appear in the base area, but not the patch area 448*96ccc8cbSesaxe for fileName in compFiles : 449*96ccc8cbSesaxe if not fileName in ptchList : 450*96ccc8cbSesaxe deletedFiles.append(fileName) 451*96ccc8cbSesaxe 452*96ccc8cbSesaxe # Eliminate "deleted" files from the list of objects appearing 453*96ccc8cbSesaxe # in both the base and patch proto areas 454*96ccc8cbSesaxe for fileName in deletedFiles : 455*96ccc8cbSesaxe try: 456*96ccc8cbSesaxe compFiles.remove(fileName) 457*96ccc8cbSesaxe except: 458*96ccc8cbSesaxe error("filelist.remove() failed") 459*96ccc8cbSesaxe 460*96ccc8cbSesaxe # New files appear in the patch area, but not the base 461*96ccc8cbSesaxe for fileName in ptchList : 462*96ccc8cbSesaxe if not fileName in compFiles : 463*96ccc8cbSesaxe newFiles.append(fileName) 464*96ccc8cbSesaxe 465*96ccc8cbSesaxe return compFiles, newFiles, deletedFiles 466*96ccc8cbSesaxe 467*96ccc8cbSesaxe# 468*96ccc8cbSesaxe# Examine the files listed in the input file list 469*96ccc8cbSesaxe# 470*96ccc8cbSesaxe# Return a list of files appearing in both proto areas, 471*96ccc8cbSesaxe# a list of new files (files found only in ptch) and 472*96ccc8cbSesaxe# a list of deleted files (files found only in base) 473*96ccc8cbSesaxe# 474*96ccc8cbSesaxedef flistCatalog(base, ptch, flist) : 475*96ccc8cbSesaxe compFiles = [] # List of files in both proto areas 476*96ccc8cbSesaxe newFiles = [] # New files detected 477*96ccc8cbSesaxe deletedFiles = [] # Deleted files 478*96ccc8cbSesaxe 479*96ccc8cbSesaxe try: 480*96ccc8cbSesaxe fd = open(flist, "r") 481*96ccc8cbSesaxe except: 482*96ccc8cbSesaxe error("could not open: " + flist) 483*96ccc8cbSesaxe cleanup(1) 484*96ccc8cbSesaxe 485*96ccc8cbSesaxe files = [] 486*96ccc8cbSesaxe files = fd.readlines() 487*96ccc8cbSesaxe 488*96ccc8cbSesaxe for f in files : 489*96ccc8cbSesaxe ptch_present = True 490*96ccc8cbSesaxe base_present = True 491*96ccc8cbSesaxe 492*96ccc8cbSesaxe if f == '\n' : 493*96ccc8cbSesaxe continue 494*96ccc8cbSesaxe 495*96ccc8cbSesaxe # the fileNames have a trailing '\n' 496*96ccc8cbSesaxe f = f.rstrip() 497*96ccc8cbSesaxe 498*96ccc8cbSesaxe # The objects in the file list have paths relative 499*96ccc8cbSesaxe # to $ROOT or to the base/ptch directory specified on 500*96ccc8cbSesaxe # the command line. 501*96ccc8cbSesaxe # If it's relative to $ROOT, we'll need to add back the 502*96ccc8cbSesaxe # root_`uname -p` goo we stripped off in fnFormat() 503*96ccc8cbSesaxe if os.path.exists(base + f) : 504*96ccc8cbSesaxe fn = f; 505*96ccc8cbSesaxe elif os.path.exists(base + "root_" + arch + "/" + f) : 506*96ccc8cbSesaxe fn = "root_" + arch + "/" + f 507*96ccc8cbSesaxe else : 508*96ccc8cbSesaxe base_present = False 509*96ccc8cbSesaxe 510*96ccc8cbSesaxe if base_present : 511*96ccc8cbSesaxe if not os.path.exists(ptch + fn) : 512*96ccc8cbSesaxe ptch_present = False 513*96ccc8cbSesaxe else : 514*96ccc8cbSesaxe if os.path.exists(ptch + f) : 515*96ccc8cbSesaxe fn = f 516*96ccc8cbSesaxe elif os.path.exists(ptch + "root_" + arch + "/" + f) : 517*96ccc8cbSesaxe fn = "root_" + arch + "/" + f 518*96ccc8cbSesaxe else : 519*96ccc8cbSesaxe ptch_present = False 520*96ccc8cbSesaxe 521*96ccc8cbSesaxe if os.path.islink(base + fn) : # ignore links 522*96ccc8cbSesaxe base_present = False 523*96ccc8cbSesaxe if os.path.islink(ptch + fn) : 524*96ccc8cbSesaxe ptch_present = False 525*96ccc8cbSesaxe 526*96ccc8cbSesaxe if base_present and ptch_present : 527*96ccc8cbSesaxe compFiles.append(fn) 528*96ccc8cbSesaxe elif base_present : 529*96ccc8cbSesaxe deletedFiles.append(fn) 530*96ccc8cbSesaxe elif ptch_present : 531*96ccc8cbSesaxe newFiles.append(fn) 532*96ccc8cbSesaxe else : 533*96ccc8cbSesaxe if os.path.islink(base + fn) and os.path.islink(ptch + fn) : 534*96ccc8cbSesaxe continue 535*96ccc8cbSesaxe error(f + " in file list, but not in either tree. Skipping...") 536*96ccc8cbSesaxe 537*96ccc8cbSesaxe return compFiles, newFiles, deletedFiles 538*96ccc8cbSesaxe 539*96ccc8cbSesaxe 540*96ccc8cbSesaxe# 541*96ccc8cbSesaxe# Build a fully qualified path to an external tool/utility. 542*96ccc8cbSesaxe# Consider the default system locations. For onbld tools, if 543*96ccc8cbSesaxe# the -t option was specified, we'll try to use built tools in $SRC tools, 544*96ccc8cbSesaxe# and otherwise, we'll fall back on /opt/onbld/ 545*96ccc8cbSesaxe# 546*96ccc8cbSesaxedef find_tool(tool) : 547*96ccc8cbSesaxe 548*96ccc8cbSesaxe # First, check what was passed 549*96ccc8cbSesaxe if os.path.exists(tool) : 550*96ccc8cbSesaxe return tool 551*96ccc8cbSesaxe 552*96ccc8cbSesaxe # Next try in wsdiff path 553*96ccc8cbSesaxe for pdir in wsdiff_path : 554*96ccc8cbSesaxe location = pdir + "/" + tool 555*96ccc8cbSesaxe if os.path.exists(location) : 556*96ccc8cbSesaxe return location + " " 557*96ccc8cbSesaxe 558*96ccc8cbSesaxe location = pdir + "/" + arch + "/" + tool 559*96ccc8cbSesaxe if os.path.exists(location) : 560*96ccc8cbSesaxe return location + " " 561*96ccc8cbSesaxe 562*96ccc8cbSesaxe error("Could not find path to: " + tool); 563*96ccc8cbSesaxe sys.exit(1); 564*96ccc8cbSesaxe 565*96ccc8cbSesaxe 566*96ccc8cbSesaxe##### 567*96ccc8cbSesaxe# ELF file comparison helper routines 568*96ccc8cbSesaxe# 569*96ccc8cbSesaxe 570*96ccc8cbSesaxe# 571*96ccc8cbSesaxe# Return a dictionary of ELF section types keyed by section name 572*96ccc8cbSesaxe# 573*96ccc8cbSesaxedef get_elfheader(f) : 574*96ccc8cbSesaxe 575*96ccc8cbSesaxe header = {} 576*96ccc8cbSesaxe 577*96ccc8cbSesaxe hstring = commands.getoutput(elfdump_cmd + " -c " + f) 578*96ccc8cbSesaxe 579*96ccc8cbSesaxe if len(hstring) == 0 : 580*96ccc8cbSesaxe error("Failed to dump ELF header for " + f) 581*96ccc8cbSesaxe return 582*96ccc8cbSesaxe 583*96ccc8cbSesaxe # elfdump(1) dumps the section headers with the section name 584*96ccc8cbSesaxe # following "sh_name:", and the section type following "sh_type:" 585*96ccc8cbSesaxe sections = hstring.split("Section Header") 586*96ccc8cbSesaxe for sect in sections : 587*96ccc8cbSesaxe datap = sect.find("sh_name:"); 588*96ccc8cbSesaxe if datap == -1 : 589*96ccc8cbSesaxe continue 590*96ccc8cbSesaxe section = sect[datap:].split()[1] 591*96ccc8cbSesaxe datap = sect.find("sh_type:"); 592*96ccc8cbSesaxe if datap == -1 : 593*96ccc8cbSesaxe error("Could not get type for sect: " + section + \ 594*96ccc8cbSesaxe " in " + f) 595*96ccc8cbSesaxe sh_type = sect[datap:].split()[2] 596*96ccc8cbSesaxe header[section] = sh_type 597*96ccc8cbSesaxe 598*96ccc8cbSesaxe return header 599*96ccc8cbSesaxe 600*96ccc8cbSesaxe# 601*96ccc8cbSesaxe# Extract data in the specified ELF section from the given file 602*96ccc8cbSesaxe# 603*96ccc8cbSesaxedef extract_elf_section(f, section) : 604*96ccc8cbSesaxe 605*96ccc8cbSesaxe data = commands.getoutput(dump_cmd + " -sn " + section + " " + f) 606*96ccc8cbSesaxe 607*96ccc8cbSesaxe if len(data) == 0 : 608*96ccc8cbSesaxe error(cmd + " yielded no data") 609*96ccc8cbSesaxe return 610*96ccc8cbSesaxe 611*96ccc8cbSesaxe # dump(1) displays the file name to start... 612*96ccc8cbSesaxe # get past it to the data itself 613*96ccc8cbSesaxe dbegin = data.find(":") + 1 614*96ccc8cbSesaxe data = data[dbegin:]; 615*96ccc8cbSesaxe 616*96ccc8cbSesaxe return (data) 617*96ccc8cbSesaxe 618*96ccc8cbSesaxe# 619*96ccc8cbSesaxe# Return a (hopefully meaningful) human readable set of diffs 620*96ccc8cbSesaxe# for the specified ELF section between f1 and f2 621*96ccc8cbSesaxe# 622*96ccc8cbSesaxe# Depending on the section, various means for dumping and diffing 623*96ccc8cbSesaxe# the data may be employed. 624*96ccc8cbSesaxe# 625*96ccc8cbSesaxetext_sections = [ '.text', '.init', '.fini' ] 626*96ccc8cbSesaxedef diff_elf_section(f1, f2, section, sh_type) : 627*96ccc8cbSesaxe 628*96ccc8cbSesaxe if (sh_type == "SHT_RELA") : # sh_type == SHT_RELA 629*96ccc8cbSesaxe cmd1 = elfdump_cmd + " -r " + f1 + " > " + tmpFile1 630*96ccc8cbSesaxe cmd2 = elfdump_cmd + " -r " + f2 + " > " + tmpFile2 631*96ccc8cbSesaxe elif (section == ".group") : 632*96ccc8cbSesaxe cmd1 = elfdump_cmd + " -g " + f1 + " > " + tmpFile1 633*96ccc8cbSesaxe cmd2 = elfdump_cmd + " -g " + f2 + " > " + tmpFile2 634*96ccc8cbSesaxe elif (section == ".hash") : 635*96ccc8cbSesaxe cmd1 = elfdump_cmd + " -h " + f1 + " > " + tmpFile1 636*96ccc8cbSesaxe cmd2 = elfdump_cmd + " -h " + f2 + " > " + tmpFile2 637*96ccc8cbSesaxe elif (section == ".dynamic") : 638*96ccc8cbSesaxe cmd1 = elfdump_cmd + " -d " + f1 + " > " + tmpFile1 639*96ccc8cbSesaxe cmd2 = elfdump_cmd + " -d " + f2 + " > " + tmpFile2 640*96ccc8cbSesaxe elif (section == ".got") : 641*96ccc8cbSesaxe cmd1 = elfdump_cmd + " -G " + f1 + " > " + tmpFile1 642*96ccc8cbSesaxe cmd2 = elfdump_cmd + " -G " + f2 + " > " + tmpFile2 643*96ccc8cbSesaxe elif (section == ".SUNW_cap") : 644*96ccc8cbSesaxe cmd1 = elfdump_cmd + " -H " + f1 + " > " + tmpFile1 645*96ccc8cbSesaxe cmd2 = elfdump_cmd + " -H " + f2 + " > " + tmpFile2 646*96ccc8cbSesaxe elif (section == ".interp") : 647*96ccc8cbSesaxe cmd1 = elfdump_cmd + " -i " + f1 + " > " + tmpFile1 648*96ccc8cbSesaxe cmd2 = elfdump_cmd + " -i " + f2 + " > " + tmpFile2 649*96ccc8cbSesaxe elif (section == ".symtab" or section == ".dynsym") : 650*96ccc8cbSesaxe cmd1 = elfdump_cmd + " -s -N " + section + " " + f1 + " > " + tmpFile1 651*96ccc8cbSesaxe cmd2 = elfdump_cmd + " -s -N " + section + " " + f2 + " > " + tmpFile2 652*96ccc8cbSesaxe elif (section in text_sections) : 653*96ccc8cbSesaxe # dis sometimes complains when it hits something it doesn't 654*96ccc8cbSesaxe # know how to disassemble. Just ignore it, as the output 655*96ccc8cbSesaxe # being generated here is human readable, and we've already 656*96ccc8cbSesaxe # correctly flagged the difference. 657*96ccc8cbSesaxe cmd1 = dis_cmd + " -t " + section + " " + f1 + \ 658*96ccc8cbSesaxe " 2>/dev/null | grep -v disassembly > " + tmpFile1 659*96ccc8cbSesaxe cmd2 = dis_cmd + " -t " + section + " " + f2 + \ 660*96ccc8cbSesaxe " 2>/dev/null | grep -v disassembly > " + tmpFile2 661*96ccc8cbSesaxe else : 662*96ccc8cbSesaxe cmd1 = elfdump_cmd + " -w " + tmpFile1 + " -N " + \ 663*96ccc8cbSesaxe section + " " + f1 664*96ccc8cbSesaxe cmd2 = elfdump_cmd + " -w " + tmpFile2 + " -N " + \ 665*96ccc8cbSesaxe section + " " + f2 666*96ccc8cbSesaxe 667*96ccc8cbSesaxe os.system(cmd1) 668*96ccc8cbSesaxe os.system(cmd2) 669*96ccc8cbSesaxe 670*96ccc8cbSesaxe data = diffFileData(tmpFile1, tmpFile2) 671*96ccc8cbSesaxe 672*96ccc8cbSesaxe return (data) 673*96ccc8cbSesaxe 674*96ccc8cbSesaxe# 675*96ccc8cbSesaxe# compare the relevant sections of two ELF binaries 676*96ccc8cbSesaxe# and report any differences 677*96ccc8cbSesaxe# 678*96ccc8cbSesaxe# Returns: 1 if any differenes found 679*96ccc8cbSesaxe# 0 if no differences found 680*96ccc8cbSesaxe# -1 on error 681*96ccc8cbSesaxe# 682*96ccc8cbSesaxe 683*96ccc8cbSesaxe# Sections deliberately not considered when comparing two ELF 684*96ccc8cbSesaxe# binaries. Differences observed in these sections are not considered 685*96ccc8cbSesaxe# significant where patch deliverable identification is concerned. 686*96ccc8cbSesaxesections_to_skip = [ ".SUNW_signature", 687*96ccc8cbSesaxe ".comment", 688*96ccc8cbSesaxe ".SUNW_ctf", 689*96ccc8cbSesaxe ".debug", 690*96ccc8cbSesaxe ".plt", 691*96ccc8cbSesaxe ".rela.bss", 692*96ccc8cbSesaxe ".rela.plt", 693*96ccc8cbSesaxe ".line", 694*96ccc8cbSesaxe ".note", 695*96ccc8cbSesaxe ] 696*96ccc8cbSesaxe 697*96ccc8cbSesaxesections_preferred = [ ".rodata.str1.8", 698*96ccc8cbSesaxe ".rodata.str1.1", 699*96ccc8cbSesaxe ".rodata", 700*96ccc8cbSesaxe ".data1", 701*96ccc8cbSesaxe ".data", 702*96ccc8cbSesaxe ".text", 703*96ccc8cbSesaxe ] 704*96ccc8cbSesaxe 705*96ccc8cbSesaxedef compareElfs(base, ptch, quiet) : 706*96ccc8cbSesaxe 707*96ccc8cbSesaxe global logging 708*96ccc8cbSesaxe 709*96ccc8cbSesaxe base_header = get_elfheader(base) 710*96ccc8cbSesaxe sections = base_header.keys() 711*96ccc8cbSesaxe 712*96ccc8cbSesaxe ptch_header = get_elfheader(ptch) 713*96ccc8cbSesaxe e2_only_sections = ptch_header.keys() 714*96ccc8cbSesaxe 715*96ccc8cbSesaxe e1_only_sections = [] 716*96ccc8cbSesaxe 717*96ccc8cbSesaxe fileName = fnFormat(base) 718*96ccc8cbSesaxe 719*96ccc8cbSesaxe # Derive the list of ELF sections found only in 720*96ccc8cbSesaxe # either e1 or e2. 721*96ccc8cbSesaxe for sect in sections : 722*96ccc8cbSesaxe if not sect in e2_only_sections : 723*96ccc8cbSesaxe e1_only_sections.append(sect) 724*96ccc8cbSesaxe else : 725*96ccc8cbSesaxe e2_only_sections.remove(sect) 726*96ccc8cbSesaxe 727*96ccc8cbSesaxe if len(e1_only_sections) > 0 : 728*96ccc8cbSesaxe if quiet : 729*96ccc8cbSesaxe return 1 730*96ccc8cbSesaxe info(fileName); 731*96ccc8cbSesaxe if not logging : 732*96ccc8cbSesaxe return 1 733*96ccc8cbSesaxe 734*96ccc8cbSesaxe slist = "" 735*96ccc8cbSesaxe for sect in e1_only_sections : 736*96ccc8cbSesaxe slist = slist + sect + "\t" 737*96ccc8cbSesaxe v_info("\nELF sections found in " + \ 738*96ccc8cbSesaxe base + " but not in " + ptch) 739*96ccc8cbSesaxe v_info("\n" + slist) 740*96ccc8cbSesaxe return 1 741*96ccc8cbSesaxe 742*96ccc8cbSesaxe if len(e2_only_sections) > 0 : 743*96ccc8cbSesaxe if quiet : 744*96ccc8cbSesaxe return 1 745*96ccc8cbSesaxe 746*96ccc8cbSesaxe info(fileName); 747*96ccc8cbSesaxe if not logging : 748*96ccc8cbSesaxe return 1 749*96ccc8cbSesaxe 750*96ccc8cbSesaxe slist = "" 751*96ccc8cbSesaxe for sect in e2_only_sections : 752*96ccc8cbSesaxe slist = slist + sect + "\t" 753*96ccc8cbSesaxe v_info("\nELF sections found in " + \ 754*96ccc8cbSesaxe ptch + " but not in " + base) 755*96ccc8cbSesaxe v_info("\n" + slist) 756*96ccc8cbSesaxe return 1 757*96ccc8cbSesaxe 758*96ccc8cbSesaxe # Look for preferred sections, and put those at the 759*96ccc8cbSesaxe # top of the list of sections to compare 760*96ccc8cbSesaxe for psect in sections_preferred : 761*96ccc8cbSesaxe if psect in sections : 762*96ccc8cbSesaxe sections.remove(psect) 763*96ccc8cbSesaxe sections.insert(0, psect) 764*96ccc8cbSesaxe 765*96ccc8cbSesaxe # Compare ELF sections 766*96ccc8cbSesaxe first_section = True 767*96ccc8cbSesaxe for sect in sections : 768*96ccc8cbSesaxe 769*96ccc8cbSesaxe if sect in sections_to_skip : 770*96ccc8cbSesaxe continue 771*96ccc8cbSesaxe 772*96ccc8cbSesaxe s1 = extract_elf_section(base, sect); 773*96ccc8cbSesaxe s2 = extract_elf_section(ptch, sect); 774*96ccc8cbSesaxe 775*96ccc8cbSesaxe if len(s1) != len (s2) or s1 != s2: 776*96ccc8cbSesaxe if not quiet: 777*96ccc8cbSesaxe sh_type = base_header[sect] 778*96ccc8cbSesaxe data = diff_elf_section(base, ptch, sect, \ 779*96ccc8cbSesaxe sh_type) 780*96ccc8cbSesaxe 781*96ccc8cbSesaxe # If all ELF sections are being reported, then 782*96ccc8cbSesaxe # invoke difference() to flag the file name to 783*96ccc8cbSesaxe # stdout only once. Any other section differences 784*96ccc8cbSesaxe # should be logged to the results file directly 785*96ccc8cbSesaxe if not first_section : 786*96ccc8cbSesaxe log_difference(fileName, "ELF " + sect, data) 787*96ccc8cbSesaxe else : 788*96ccc8cbSesaxe difference(fileName, "ELF " + sect, data) 789*96ccc8cbSesaxe 790*96ccc8cbSesaxe if not reportAllSects : 791*96ccc8cbSesaxe return 1 792*96ccc8cbSesaxe first_section = False 793*96ccc8cbSesaxe return 0 794*96ccc8cbSesaxe 795*96ccc8cbSesaxe##### 796*96ccc8cbSesaxe# Archive object comparison 797*96ccc8cbSesaxe# 798*96ccc8cbSesaxe# Returns 1 if difference detected 799*96ccc8cbSesaxe# 0 if no difference detected 800*96ccc8cbSesaxe# -1 on error 801*96ccc8cbSesaxe# 802*96ccc8cbSesaxedef compareArchives(base, ptch, fileType) : 803*96ccc8cbSesaxe 804*96ccc8cbSesaxe fileName = fnFormat(base) 805*96ccc8cbSesaxe 806*96ccc8cbSesaxe # clear the temp directories 807*96ccc8cbSesaxe baseCmd = "rm -rf " + tmpDir1 + "*" 808*96ccc8cbSesaxe status, output = commands.getstatusoutput(baseCmd) 809*96ccc8cbSesaxe if status != 0 : 810*96ccc8cbSesaxe error(baseCmd + " failed: " + output) 811*96ccc8cbSesaxe return -1 812*96ccc8cbSesaxe 813*96ccc8cbSesaxe ptchCmd = "rm -rf " + tmpDir2 + "*" 814*96ccc8cbSesaxe status, output = commands.getstatusoutput(ptchCmd) 815*96ccc8cbSesaxe if status != 0 : 816*96ccc8cbSesaxe error(ptchCmd + " failed: " + output) 817*96ccc8cbSesaxe return -1 818*96ccc8cbSesaxe 819*96ccc8cbSesaxe # 820*96ccc8cbSesaxe # Be optimistic and first try a straight file compare 821*96ccc8cbSesaxe # as it will allow us to finish up quickly. 822*96ccc8cbSesaxe if compareBasic(base, ptch, True, fileType) == 0 : 823*96ccc8cbSesaxe return 0 824*96ccc8cbSesaxe 825*96ccc8cbSesaxe # copy over the objects to the temp areas, and 826*96ccc8cbSesaxe # unpack them 827*96ccc8cbSesaxe baseCmd = "cp -fp " + base + " " + tmpDir1 828*96ccc8cbSesaxe status, output = commands.getstatusoutput(baseCmd) 829*96ccc8cbSesaxe if status != 0 : 830*96ccc8cbSesaxe error(baseCmd + " failed: " + output) 831*96ccc8cbSesaxe return -1 832*96ccc8cbSesaxe 833*96ccc8cbSesaxe ptchCmd = "cp -fp " + ptch + " " + tmpDir2 834*96ccc8cbSesaxe status, output = commands.getstatusoutput(ptchCmd) 835*96ccc8cbSesaxe if status != 0 : 836*96ccc8cbSesaxe error(ptchCmd + " failed: " + output) 837*96ccc8cbSesaxe return -1 838*96ccc8cbSesaxe 839*96ccc8cbSesaxe bname = string.split(fileName, '/')[-1] 840*96ccc8cbSesaxe if fileType == "Java Archive" : 841*96ccc8cbSesaxe baseCmd = "cd " + tmpDir1 + "; " + "jar xf " + bname + \ 842*96ccc8cbSesaxe "; rm -f " + bname + " META-INF/MANIFEST.MF" 843*96ccc8cbSesaxe ptchCmd = "cd " + tmpDir2 + "; " + "jar xf " + bname + \ 844*96ccc8cbSesaxe "; rm -f " + bname + " META-INF/MANIFEST.MF" 845*96ccc8cbSesaxe elif fileType == "ELF Object Archive" : 846*96ccc8cbSesaxe baseCmd = "cd " + tmpDir1 + "; " + "/usr/ccs/bin/ar x " + \ 847*96ccc8cbSesaxe bname + "; rm -f " + bname 848*96ccc8cbSesaxe ptchCmd = "cd " + tmpDir2 + "; " + "/usr/ccs/bin/ar x " + \ 849*96ccc8cbSesaxe bname + "; rm -f " + bname 850*96ccc8cbSesaxe else : 851*96ccc8cbSesaxe error("unexpected file type: " + fileType) 852*96ccc8cbSesaxe return -1 853*96ccc8cbSesaxe 854*96ccc8cbSesaxe os.system(baseCmd) 855*96ccc8cbSesaxe os.system(ptchCmd) 856*96ccc8cbSesaxe 857*96ccc8cbSesaxe baseFlist = list(findFiles(tmpDir1)) 858*96ccc8cbSesaxe ptchFlist = list(findFiles(tmpDir2)) 859*96ccc8cbSesaxe 860*96ccc8cbSesaxe # Trim leading path off base/ptch file lists 861*96ccc8cbSesaxe flist = [] 862*96ccc8cbSesaxe for fn in baseFlist : 863*96ccc8cbSesaxe flist.append(str_prefix_trunc(fn, tmpDir1)) 864*96ccc8cbSesaxe baseFlist = flist 865*96ccc8cbSesaxe 866*96ccc8cbSesaxe flist = [] 867*96ccc8cbSesaxe for fn in ptchFlist : 868*96ccc8cbSesaxe flist.append(str_prefix_trunc(fn, tmpDir2)) 869*96ccc8cbSesaxe ptchFlist = flist 870*96ccc8cbSesaxe 871*96ccc8cbSesaxe for fn in ptchFlist : 872*96ccc8cbSesaxe if not fn in baseFlist : 873*96ccc8cbSesaxe difference(fileName, fileType, \ 874*96ccc8cbSesaxe fn + " added to " + fileName) 875*96ccc8cbSesaxe return 1 876*96ccc8cbSesaxe 877*96ccc8cbSesaxe for fn in baseFlist : 878*96ccc8cbSesaxe if not fn in ptchFlist : 879*96ccc8cbSesaxe difference(fileName, fileType, \ 880*96ccc8cbSesaxe fn + " removed from " + fileName) 881*96ccc8cbSesaxe return 1 882*96ccc8cbSesaxe 883*96ccc8cbSesaxe differs = compareOneFile((tmpDir1 + fn), (tmpDir2 + fn), True) 884*96ccc8cbSesaxe if differs : 885*96ccc8cbSesaxe difference(fileName, fileType, \ 886*96ccc8cbSesaxe fn + " in " + fileName + " differs") 887*96ccc8cbSesaxe return 1 888*96ccc8cbSesaxe return 0 889*96ccc8cbSesaxe 890*96ccc8cbSesaxe##### 891*96ccc8cbSesaxe# (Basic) file comparison 892*96ccc8cbSesaxe# 893*96ccc8cbSesaxe# There's some special case code here for Javadoc HTML files 894*96ccc8cbSesaxe# 895*96ccc8cbSesaxe# Returns 1 if difference detected 896*96ccc8cbSesaxe# 0 if no difference detected 897*96ccc8cbSesaxe# -1 on error 898*96ccc8cbSesaxe# 899*96ccc8cbSesaxedef compareBasic(base, ptch, quiet, fileType) : 900*96ccc8cbSesaxe 901*96ccc8cbSesaxe fileName = fnFormat(base); 902*96ccc8cbSesaxe 903*96ccc8cbSesaxe if quiet and os.stat(base)[ST_SIZE] != os.stat(ptch)[ST_SIZE] : 904*96ccc8cbSesaxe return 1 905*96ccc8cbSesaxe 906*96ccc8cbSesaxe try: 907*96ccc8cbSesaxe baseFile = open(base) 908*96ccc8cbSesaxe except: 909*96ccc8cbSesaxe error("could not open " + base) 910*96ccc8cbSesaxe return -1 911*96ccc8cbSesaxe try: 912*96ccc8cbSesaxe ptchFile = open(ptch) 913*96ccc8cbSesaxe except: 914*96ccc8cbSesaxe error("could not open " + ptch) 915*96ccc8cbSesaxe return -1 916*96ccc8cbSesaxe 917*96ccc8cbSesaxe baseData = baseFile.read() 918*96ccc8cbSesaxe ptchData = ptchFile.read() 919*96ccc8cbSesaxe 920*96ccc8cbSesaxe baseFile.close() 921*96ccc8cbSesaxe ptchFile.close() 922*96ccc8cbSesaxe 923*96ccc8cbSesaxe needToSnip = False 924*96ccc8cbSesaxe if fileType == "HTML" : 925*96ccc8cbSesaxe needToSnip = True 926*96ccc8cbSesaxe toSnipBeginStr = "<!-- Generated by javadoc" 927*96ccc8cbSesaxe toSnipEndStr = "-->\n" 928*96ccc8cbSesaxe 929*96ccc8cbSesaxe if needToSnip : 930*96ccc8cbSesaxe toSnipBegin = string.find(baseData, toSnipBeginStr) 931*96ccc8cbSesaxe if toSnipBegin != -1 : 932*96ccc8cbSesaxe toSnipEnd = string.find(baseData[toSnipBegin:], \ 933*96ccc8cbSesaxe toSnipEndStr) + \ 934*96ccc8cbSesaxe len(toSnipEndStr) 935*96ccc8cbSesaxe baseData = baseData[:toSnipBegin] + \ 936*96ccc8cbSesaxe baseData[toSnipBegin + toSnipEnd:] 937*96ccc8cbSesaxe ptchData = ptchData[:toSnipBegin] + \ 938*96ccc8cbSesaxe ptchData[toSnipBegin + toSnipEnd:] 939*96ccc8cbSesaxe 940*96ccc8cbSesaxe if quiet : 941*96ccc8cbSesaxe if baseData != ptchData : 942*96ccc8cbSesaxe return 1 943*96ccc8cbSesaxe else : 944*96ccc8cbSesaxe if len(baseData) != len(ptchData) or baseData != ptchData : 945*96ccc8cbSesaxe diffs = diffData(baseData, ptchData) 946*96ccc8cbSesaxe difference(fileName, fileType, diffs) 947*96ccc8cbSesaxe return 1 948*96ccc8cbSesaxe return 0 949*96ccc8cbSesaxe 950*96ccc8cbSesaxe 951*96ccc8cbSesaxe##### 952*96ccc8cbSesaxe# Compare two objects by producing a data dump from 953*96ccc8cbSesaxe# each object, and then comparing the dump data 954*96ccc8cbSesaxe# 955*96ccc8cbSesaxe# Returns: 1 if a difference is detected 956*96ccc8cbSesaxe# 0 if no difference detected 957*96ccc8cbSesaxe# -1 upon error 958*96ccc8cbSesaxe# 959*96ccc8cbSesaxedef compareByDumping(base, ptch, quiet, fileType) : 960*96ccc8cbSesaxe 961*96ccc8cbSesaxe fileName = fnFormat(base); 962*96ccc8cbSesaxe 963*96ccc8cbSesaxe if fileType == "Lint Library" : 964*96ccc8cbSesaxe baseCmd = lintdump_cmd + " -ir " + base + \ 965*96ccc8cbSesaxe " | grep -v LINTLIB:" + " > " + tmpFile1 966*96ccc8cbSesaxe ptchCmd = lintdump_cmd + " -ir " + ptch + \ 967*96ccc8cbSesaxe " | grep -v LINTLIB:" + " > " + tmpFile2 968*96ccc8cbSesaxe elif fileType == "Sqlite Database" : 969*96ccc8cbSesaxe baseCmd = "echo .dump | " + sqlite_cmd + base + " > " + \ 970*96ccc8cbSesaxe tmpFile1 971*96ccc8cbSesaxe ptchCmd = "echo .dump | " + sqlite_cmd + ptch + " > " + \ 972*96ccc8cbSesaxe tmpFile2 973*96ccc8cbSesaxe 974*96ccc8cbSesaxe os.system(baseCmd) 975*96ccc8cbSesaxe os.system(ptchCmd) 976*96ccc8cbSesaxe 977*96ccc8cbSesaxe try: 978*96ccc8cbSesaxe baseFile = open(tmpFile1) 979*96ccc8cbSesaxe except: 980*96ccc8cbSesaxe error("could not open: " + tmpFile1) 981*96ccc8cbSesaxe try: 982*96ccc8cbSesaxe ptchFile = open(tmpFile2) 983*96ccc8cbSesaxe except: 984*96ccc8cbSesaxe error("could not open: " + tmpFile2) 985*96ccc8cbSesaxe 986*96ccc8cbSesaxe baseData = baseFile.read() 987*96ccc8cbSesaxe ptchData = ptchFile.read() 988*96ccc8cbSesaxe 989*96ccc8cbSesaxe baseFile.close() 990*96ccc8cbSesaxe ptchFile.close() 991*96ccc8cbSesaxe 992*96ccc8cbSesaxe if len(baseData) != len(ptchData) or baseData != ptchData : 993*96ccc8cbSesaxe if not quiet : 994*96ccc8cbSesaxe data = diffFileData(tmpFile1, tmpFile2); 995*96ccc8cbSesaxe difference(fileName, fileType, data) 996*96ccc8cbSesaxe return 1 997*96ccc8cbSesaxe return 0 998*96ccc8cbSesaxe 999*96ccc8cbSesaxe##### 1000*96ccc8cbSesaxe# Compare two objects. Detect type changes. 1001*96ccc8cbSesaxe# Vector off to the appropriate type specific 1002*96ccc8cbSesaxe# compare routine based on the type. 1003*96ccc8cbSesaxe# 1004*96ccc8cbSesaxedef compareOneFile(base, ptch, quiet) : 1005*96ccc8cbSesaxe 1006*96ccc8cbSesaxe # Verify the file types. 1007*96ccc8cbSesaxe # If they are different, indicate this and move on 1008*96ccc8cbSesaxe btype = getTheFileType(base) 1009*96ccc8cbSesaxe ptype = getTheFileType(ptch) 1010*96ccc8cbSesaxe 1011*96ccc8cbSesaxe fileName = fnFormat(base) 1012*96ccc8cbSesaxe 1013*96ccc8cbSesaxe if (btype != ptype) : 1014*96ccc8cbSesaxe difference(fileName, "file type", btype + " to " + ptype) 1015*96ccc8cbSesaxe return 1 1016*96ccc8cbSesaxe else : 1017*96ccc8cbSesaxe fileType = btype 1018*96ccc8cbSesaxe 1019*96ccc8cbSesaxe if (fileType == 'ELF') : 1020*96ccc8cbSesaxe return compareElfs(base, ptch, quiet) 1021*96ccc8cbSesaxe 1022*96ccc8cbSesaxe elif (fileType == 'Java Archive' or fileType == 'ELF Object Archive') : 1023*96ccc8cbSesaxe return compareArchives(base, ptch, fileType) 1024*96ccc8cbSesaxe 1025*96ccc8cbSesaxe elif (fileType == 'HTML') : 1026*96ccc8cbSesaxe return compareBasic(base, ptch, quiet, fileType) 1027*96ccc8cbSesaxe 1028*96ccc8cbSesaxe elif ( fileType == 'Lint Library' ) : 1029*96ccc8cbSesaxe return compareByDumping(base, ptch, quiet, fileType) 1030*96ccc8cbSesaxe 1031*96ccc8cbSesaxe elif ( fileType == 'Sqlite Database' ) : 1032*96ccc8cbSesaxe return compareByDumping(base, ptch, quiet, fileType) 1033*96ccc8cbSesaxe else : 1034*96ccc8cbSesaxe # it has to be some variety of text file 1035*96ccc8cbSesaxe return compareBasic(base, ptch, quiet, fileType) 1036*96ccc8cbSesaxe 1037*96ccc8cbSesaxe# Cleanup and self-terminate 1038*96ccc8cbSesaxedef cleanup(ret) : 1039*96ccc8cbSesaxe 1040*96ccc8cbSesaxe if len(tmpDir1) > 0 and len(tmpDir2) > 0 : 1041*96ccc8cbSesaxe 1042*96ccc8cbSesaxe baseCmd = "rm -rf " + tmpDir1 1043*96ccc8cbSesaxe ptchCmd = "rm -rf " + tmpDir2 1044*96ccc8cbSesaxe 1045*96ccc8cbSesaxe os.system(baseCmd) 1046*96ccc8cbSesaxe os.system(ptchCmd) 1047*96ccc8cbSesaxe 1048*96ccc8cbSesaxe if logging : 1049*96ccc8cbSesaxe log.close() 1050*96ccc8cbSesaxe 1051*96ccc8cbSesaxe sys.exit(ret) 1052*96ccc8cbSesaxe 1053*96ccc8cbSesaxedef main() : 1054*96ccc8cbSesaxe 1055*96ccc8cbSesaxe # Log file handle 1056*96ccc8cbSesaxe global log 1057*96ccc8cbSesaxe 1058*96ccc8cbSesaxe # Globals relating to command line options 1059*96ccc8cbSesaxe global logging, vdiffs, reportAllSects 1060*96ccc8cbSesaxe 1061*96ccc8cbSesaxe # Named temporary files / directories 1062*96ccc8cbSesaxe global tmpDir1, tmpDir2, tmpFile1, tmpFile2 1063*96ccc8cbSesaxe 1064*96ccc8cbSesaxe # Command paths 1065*96ccc8cbSesaxe global lintdump_cmd, elfdump_cmd, dump_cmd, dis_cmd, od_cmd, diff_cmd, sqlite_cmd 1066*96ccc8cbSesaxe 1067*96ccc8cbSesaxe # Default search path 1068*96ccc8cbSesaxe global wsdiff_path 1069*96ccc8cbSesaxe 1070*96ccc8cbSesaxe # Essentially "uname -p" 1071*96ccc8cbSesaxe global arch 1072*96ccc8cbSesaxe 1073*96ccc8cbSesaxe # Some globals need to be initialized 1074*96ccc8cbSesaxe logging = vdiffs = reportAllSects = False 1075*96ccc8cbSesaxe 1076*96ccc8cbSesaxe 1077*96ccc8cbSesaxe # Process command line arguments 1078*96ccc8cbSesaxe # Return values are returned from args() in alpha order 1079*96ccc8cbSesaxe # (Yes, python functions can return multiple values (ewww)) 1080*96ccc8cbSesaxe # Note that args() also set the globals: 1081*96ccc8cbSesaxe # logging to True if verbose logging (to a file) was enabled 1082*96ccc8cbSesaxe # vdiffs to True if logged differences aren't to be truncated 1083*96ccc8cbSesaxe # reportAllSects to True if all ELF section differences are to be reported 1084*96ccc8cbSesaxe # 1085*96ccc8cbSesaxe baseRoot, fileNamesFile, localTools, ptchRoot, results = args() 1086*96ccc8cbSesaxe 1087*96ccc8cbSesaxe # 1088*96ccc8cbSesaxe # Set up the results/log file 1089*96ccc8cbSesaxe # 1090*96ccc8cbSesaxe if logging : 1091*96ccc8cbSesaxe try: 1092*96ccc8cbSesaxe log = open(results, "w") 1093*96ccc8cbSesaxe except: 1094*96ccc8cbSesaxe logging = False 1095*96ccc8cbSesaxe error("failed to open log file: " + log) 1096*96ccc8cbSesaxe sys.exit(1) 1097*96ccc8cbSesaxe 1098*96ccc8cbSesaxe dateTimeStr= "# %d/%d/%d at %d:%d:%d" % time.localtime()[:6] 1099*96ccc8cbSesaxe v_info("# This file was produced by wsdiff") 1100*96ccc8cbSesaxe v_info(dateTimeStr) 1101*96ccc8cbSesaxe 1102*96ccc8cbSesaxe # 1103*96ccc8cbSesaxe # Build paths to the tools required tools 1104*96ccc8cbSesaxe # 1105*96ccc8cbSesaxe # Try to look for tools in $SRC/tools if the "-t" option 1106*96ccc8cbSesaxe # was specified 1107*96ccc8cbSesaxe # 1108*96ccc8cbSesaxe arch = commands.getoutput("uname -p") 1109*96ccc8cbSesaxe if localTools : 1110*96ccc8cbSesaxe try: 1111*96ccc8cbSesaxe src = os.environ['SRC'] 1112*96ccc8cbSesaxe except: 1113*96ccc8cbSesaxe error("-t specified, but $SRC not set. Cannot find $SRC/tools") 1114*96ccc8cbSesaxe src = "" 1115*96ccc8cbSesaxe if len(src) > 0 : 1116*96ccc8cbSesaxe wsdiff_path.insert(0, src + "/tools/proto/opt/onbld/bin") 1117*96ccc8cbSesaxe 1118*96ccc8cbSesaxe lintdump_cmd = find_tool("lintdump") 1119*96ccc8cbSesaxe elfdump_cmd = find_tool("elfdump") 1120*96ccc8cbSesaxe dump_cmd = find_tool("dump") 1121*96ccc8cbSesaxe od_cmd = find_tool("od") 1122*96ccc8cbSesaxe dis_cmd = find_tool("dis") 1123*96ccc8cbSesaxe diff_cmd = find_tool("diff") 1124*96ccc8cbSesaxe sqlite_cmd = find_tool("sqlite") 1125*96ccc8cbSesaxe 1126*96ccc8cbSesaxe # 1127*96ccc8cbSesaxe # validate the base and patch paths 1128*96ccc8cbSesaxe # 1129*96ccc8cbSesaxe if baseRoot[-1] != '/' : 1130*96ccc8cbSesaxe baseRoot += '/' 1131*96ccc8cbSesaxe 1132*96ccc8cbSesaxe if ptchRoot[-1] != '/' : 1133*96ccc8cbSesaxe ptchRoot += '/' 1134*96ccc8cbSesaxe 1135*96ccc8cbSesaxe if not os.path.exists(baseRoot) : 1136*96ccc8cbSesaxe error("old proto area: " + baseRoot + " does not exist") 1137*96ccc8cbSesaxe sys.exit(1) 1138*96ccc8cbSesaxe 1139*96ccc8cbSesaxe if not os.path.exists(ptchRoot) : 1140*96ccc8cbSesaxe error("new proto area: " + ptchRoot + \ 1141*96ccc8cbSesaxe " does not exist") 1142*96ccc8cbSesaxe sys.exit(1) 1143*96ccc8cbSesaxe 1144*96ccc8cbSesaxe # 1145*96ccc8cbSesaxe # log some information identifying the run 1146*96ccc8cbSesaxe # 1147*96ccc8cbSesaxe v_info("Old proto area: " + baseRoot) 1148*96ccc8cbSesaxe v_info("New proto area: " + ptchRoot) 1149*96ccc8cbSesaxe v_info("Results file: " + results + "\n") 1150*96ccc8cbSesaxe 1151*96ccc8cbSesaxe # 1152*96ccc8cbSesaxe # Set up the temporary directories / files 1153*96ccc8cbSesaxe # Could use python's tmpdir routines, but these should 1154*96ccc8cbSesaxe # be easier to identify / keep around for debugging 1155*96ccc8cbSesaxe pid = os.getpid() 1156*96ccc8cbSesaxe tmpDir1 = "/tmp/wsdiff_tmp1_" + str(pid) + "/" 1157*96ccc8cbSesaxe tmpDir2 = "/tmp/wsdiff_tmp2_" + str(pid) + "/" 1158*96ccc8cbSesaxe if not os.path.exists(tmpDir1) : 1159*96ccc8cbSesaxe os.makedirs(tmpDir1) 1160*96ccc8cbSesaxe if not os.path.exists(tmpDir2) : 1161*96ccc8cbSesaxe os.makedirs(tmpDir2) 1162*96ccc8cbSesaxe 1163*96ccc8cbSesaxe tmpFile1 = tmpDir1 + "f1" 1164*96ccc8cbSesaxe tmpFile2 = tmpDir2 + "f2" 1165*96ccc8cbSesaxe 1166*96ccc8cbSesaxe # Derive a catalog of new, deleted, and to-be-compared objects 1167*96ccc8cbSesaxe # either from the specified base and patch proto areas, or from 1168*96ccc8cbSesaxe # from an input file list 1169*96ccc8cbSesaxe newOrDeleted = False 1170*96ccc8cbSesaxe 1171*96ccc8cbSesaxe if fileNamesFile != "" : 1172*96ccc8cbSesaxe changedFiles, newFiles, deletedFiles = \ 1173*96ccc8cbSesaxe flistCatalog(baseRoot, ptchRoot, fileNamesFile) 1174*96ccc8cbSesaxe else : 1175*96ccc8cbSesaxe changedFiles, newFiles, deletedFiles = protoCatalog(baseRoot, ptchRoot) 1176*96ccc8cbSesaxe 1177*96ccc8cbSesaxe if len(newFiles) > 0 : 1178*96ccc8cbSesaxe newOrDeleted = True 1179*96ccc8cbSesaxe info("\nNew objects found: ") 1180*96ccc8cbSesaxe 1181*96ccc8cbSesaxe for fn in newFiles : 1182*96ccc8cbSesaxe info(fnFormat(fn)) 1183*96ccc8cbSesaxe 1184*96ccc8cbSesaxe if len(deletedFiles) > 0 : 1185*96ccc8cbSesaxe newOrDeleted = True 1186*96ccc8cbSesaxe info("\nObjects removed: ") 1187*96ccc8cbSesaxe 1188*96ccc8cbSesaxe for fn in deletedFiles : 1189*96ccc8cbSesaxe info(fnFormat(fn)) 1190*96ccc8cbSesaxe 1191*96ccc8cbSesaxe if newOrDeleted : 1192*96ccc8cbSesaxe info("\nChanged objects: "); 1193*96ccc8cbSesaxe 1194*96ccc8cbSesaxe 1195*96ccc8cbSesaxe # Here's where all the heavy lifting happens 1196*96ccc8cbSesaxe # Perform a comparison on each object appearing in 1197*96ccc8cbSesaxe # both proto areas. compareOneFile will examine the 1198*96ccc8cbSesaxe # file types of each object, and will vector off to 1199*96ccc8cbSesaxe # the appropriate comparison routine, where the compare 1200*96ccc8cbSesaxe # will happen, and any differences will be reported / logged 1201*96ccc8cbSesaxe for fn in changedFiles : 1202*96ccc8cbSesaxe base = baseRoot + fn 1203*96ccc8cbSesaxe ptch = ptchRoot + fn 1204*96ccc8cbSesaxe 1205*96ccc8cbSesaxe compareOneFile(base, ptch, False) 1206*96ccc8cbSesaxe 1207*96ccc8cbSesaxe # We're done, cleanup. 1208*96ccc8cbSesaxe cleanup(0) 1209*96ccc8cbSesaxe 1210*96ccc8cbSesaxeif __name__ == '__main__' : 1211*96ccc8cbSesaxe try: 1212*96ccc8cbSesaxe main() 1213*96ccc8cbSesaxe except KeyboardInterrupt : 1214*96ccc8cbSesaxe cleanup(1); 1215*96ccc8cbSesaxe 1216*96ccc8cbSesaxe 1217