Rewrite the script to add gdb index to binary files

build/add-index.sh

+#!/bin/bash
+# Copyright (c) 2012 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+#
+# Saves the gdb index for a given binary and its shared library dependencies.
+
+set -e
+
+# Adds a gdb index to the given binary.
+# $1: path to the binary
+# $2: temp directory to store .gdb-index files
+function add_index_to_binary {
+  local basename=$(basename $1)
+  echo -n "Adding index to $basename..."
+  local readelf_out=$(readelf -S $1)
+  if [[ $readelf_out =~ "gdb_index" ]]; then
+    echo "already contains index. Skipped."
+  else
+    gdb -batch $1 -ex "save gdb-index $2" -ex "quit"
+    objcopy --add-section .gdb_index=$2/$basename.gdb-index \
+      --set-section-flags .gdb_index=readonly $1 $1
+    echo "done."
+  fi
+
+  # Grab all the chromium shared library files.
+  local so_files=$(ldd $1 2>/dev/null \

[Ami GONE FROM CHROMIUM, 2012/08/02 18:16:52]

This will recursively process the .so's that the .so's depend on, probably
incorrectly.
I think you want to do this ldd business outside this function and then call
this function in a loop (and remove the recursive call below).

[vrk (LEFT CHROMIUM), 2012/08/02 22:51:32]

Done.

+    | grep $(pwd) \
+    | sed "s/.*[ \t]\(.*\) (.*/\1/")
+
+  for file in $so_files; do
+    add_index_to_binary $file $2
+  done
+}
+
+# Removes the temp directory holding .gdb-index files.
+function rm_directory {

[Ami GONE FROM CHROMIUM, 2012/08/02 18:16:52]

s/rm_/rm_tmp_/

[vrk (LEFT CHROMIUM), 2012/08/02 22:51:32]

Inlined instead.

+  echo -n "Removing temp directory $DIRECTORY..."
+  rm -rf $DIRECTORY
+  echo "done."
+  exit
+}
+trap rm_directory EXIT

[Ami GONE FROM CHROMIUM, 2012/08/02 18:16:52]

Only register this after the mktemp -d?

[vrk (LEFT CHROMIUM), 2012/08/02 22:51:32]

Done.

+
+if [[ ! $# == 1 ]]; then
+  echo "Usage: $0 path-to-binary"
+  exit
+fi
+
+FILENAME="$1"
+if [[ ! -f $FILENAME ]]; then

[Ami GONE FROM CHROMIUM, 2012/08/02 18:16:52]

""-quote $FILENAME everywhere to avoid spaces changing syntax.

[vrk (LEFT CHROMIUM), 2012/08/02 22:51:32]

Done.

+  echo "Path $FILENAME does not exist."
+  exit
+fi
+
+# Check to make sure ldd exists.

[Ami GONE FROM CHROMIUM, 2012/08/02 18:16:52]

Why check for ldd's existence but not gdb's?
Are you planning to check for gdb version number (to make sure it supports the
index functionality you use)?

[vrk (LEFT CHROMIUM), 2012/08/02 22:51:32]

Ah, I just thought gdb was more likely to already exist. Check added.
I am now! Done... though not very elegantly.

+command -v ldd &>/dev/null
+if [[ $? -gt 0 ]]; then
+  "ldd not found."
+  exit
+fi
+
+# Create temp directory for index files.
+DIRECTORY=$(mktemp -d)
+echo "Made temp directory $DIRECTORY..."
+
+add_index_to_binary $FILENAME $DIRECTORY