ruby-macho 1.0.0 → 1.1.0

data/lib/macho/load_commands.rb

@@ -2,7 +2,7 @@ module MachO
   # Classes and constants for parsing load commands in Mach-O binaries.
   module LoadCommands
     # load commands added after OS X 10.1 need to be bitwise ORed with
-    # LC_REQ_DYLD to be recognized by the dynamic linder (dyld)
+    # LC_REQ_DYLD to be recognized by the dynamic linker (dyld)
     # @api private
     LC_REQ_DYLD = 0x80000000
 
@@ -87,14 +87,21 @@ module MachO
     LC_STRUCTURES = {
       :LC_SEGMENT => "SegmentCommand",
       :LC_SYMTAB => "SymtabCommand",
-      :LC_SYMSEG => "SymsegCommand", # obsolete
-      :LC_THREAD => "ThreadCommand", # seems obsolete, but not documented as such
+      # "obsolete"
+      :LC_SYMSEG => "SymsegCommand",
+      # seems obsolete, but not documented as such
+      :LC_THREAD => "ThreadCommand",
       :LC_UNIXTHREAD => "ThreadCommand",
-      :LC_LOADFVMLIB => "FvmlibCommand", # obsolete
-      :LC_IDFVMLIB => "FvmlibCommand", # obsolete
-      :LC_IDENT => "IdentCommand", # obsolete
-      :LC_FVMFILE => "FvmfileCommand", # reserved for internal use only
-      :LC_PREPAGE => "LoadCommand", # reserved for internal use only, no public struct
+      # "obsolete"
+      :LC_LOADFVMLIB => "FvmlibCommand",
+      # "obsolete"
+      :LC_IDFVMLIB => "FvmlibCommand",
+      # "obsolete"
+      :LC_IDENT => "IdentCommand",
+      # "reserved for internal use only"
+      :LC_FVMFILE => "FvmfileCommand",
+      # "reserved for internal use only", no public struct
+      :LC_PREPAGE => "LoadCommand",
       :LC_DYSYMTAB => "DysymtabCommand",
       :LC_LOAD_DYLIB => "DylibCommand",
       :LC_ID_DYLIB => "DylibCommand",
@@ -182,7 +189,7 @@ module MachO
 
       # Instantiates a new LoadCommand given a view into its origin Mach-O
       # @param view [MachO::MachOView] the load command's raw view
-      # @return [MachO::LoadCommands::LoadCommand] the new load command
+      # @return [LoadCommand] the new load command
       # @api private
       def self.new_from_bin(view)
         bin = view.raw_data.slice(view.offset, bytesize)
@@ -218,12 +225,12 @@ module MachO
         @cmdsize = cmdsize
       end
 
-      # @return [Boolean] true if the load command can be serialized, false otherwise
+      # @return [Boolean] whether the load command can be serialized
       def serializable?
         CREATABLE_LOAD_COMMANDS.include?(LOAD_COMMANDS[cmd])
       end
 
-      # @param context [MachO::LoadCommands::LoadCommand::SerializationContext] the context
+      # @param context [SerializationContext] the context
       #  to serialize into
       # @return [String, nil] the serialized fields of the load command, or nil
       #  if the load command can't be serialized
@@ -240,14 +247,16 @@ module MachO
         view.offset
       end
 
-      # @return [Symbol] a symbol representation of the load command's identifying number
+      # @return [Symbol] a symbol representation of the load command's
+      #  identifying number
       def type
         LOAD_COMMANDS[cmd]
       end
 
       alias to_sym type
 
-      # @return [String] a string representation of the load command's identifying number
+      # @return [String] a string representation of the load command's
+      #  identifying number
       def to_s
         type.to_s
       end
@@ -257,9 +266,9 @@ module MachO
       # pretend that strings stored in LCs are immediately available without
       # explicit operations on the raw Mach-O data.
       class LCStr
-        # @param lc [MachO::LoadCommands::LoadCommand] the load command
-        # @param lc_str [Fixnum, String] the offset to the beginning of the string,
-        #  or the string itself if not being initialized with a view.
+        # @param lc [LoadCommand] the load command
+        # @param lc_str [Fixnum, String] the offset to the beginning of the
+        #  string, or the string itself if not being initialized with a view.
         # @raise [MachO::LCStrMalformedError] if the string is malformed
         # @todo devise a solution such that the `lc_str` parameter is not
         #  interpreted differently depending on `lc.view`. The current behavior
@@ -286,7 +295,8 @@ module MachO
           @string
         end
 
-        # @return [Fixnum] the offset to the beginning of the string in the load command
+        # @return [Fixnum] the offset to the beginning of the string in the
+        #  load command
         def to_i
           @string_offset
         end
@@ -298,11 +308,13 @@ module MachO
         # @return [Symbol] the endianness of the serialized load command
         attr_reader :endianness
 
-        # @return [Fixnum] the constant alignment value used to pad the serialized load command
+        # @return [Fixnum] the constant alignment value used to pad the
+        #  serialized load command
         attr_reader :alignment
 
         # @param macho [MachO::MachOFile] the file to contextualize
-        # @return [MachO::LoadCommands::LoadCommand::SerializationContext] the resulting context
+        # @return [SerializationContext] the
+        #  resulting context
         def self.context_for(macho)
           new(macho.endianness, macho.alignment)
         end
@@ -317,8 +329,9 @@ module MachO
       end
     end
 
-    # A load command containing a single 128-bit unique random number identifying
-    # an object produced by static link editor. Corresponds to LC_UUID.
+    # A load command containing a single 128-bit unique random number
+    # identifying an object produced by static link editor. Corresponds to
+    # LC_UUID.
     class UUIDCommand < LoadCommand
       # @return [Array<Fixnum>] the UUID
       attr_reader :uuid
@@ -413,7 +426,10 @@ module MachO
           MachO::Sections::Section
         end
 
-        bins = view.raw_data[view.offset + self.class.bytesize, nsects * klass.bytesize]
+        offset = view.offset + self.class.bytesize
+        length = nsects * klass.bytesize
+
+        bins = view.raw_data[offset, length]
         bins.unpack("a#{klass.bytesize}" * nsects).map do |bin|
           klass.new_from_bin(view.endianness, bin)
         end
@@ -443,10 +459,11 @@ module MachO
     end
 
     # A load command representing some aspect of shared libraries, depending
-    # on filetype. Corresponds to LC_ID_DYLIB, LC_LOAD_DYLIB, LC_LOAD_WEAK_DYLIB,
-    # and LC_REEXPORT_DYLIB.
+    # on filetype. Corresponds to LC_ID_DYLIB, LC_LOAD_DYLIB,
+    # LC_LOAD_WEAK_DYLIB, and LC_REEXPORT_DYLIB.
     class DylibCommand < LoadCommand
-      # @return [MachO::LoadCommands::LoadCommand::LCStr] the library's path name as an LCStr
+      # @return [LCStr] the library's path
+      #  name as an LCStr
       attr_reader :name
 
       # @return [Fixnum] the library's build time stamp
@@ -467,7 +484,8 @@ module MachO
       SIZEOF = 24
 
       # @api private
-      def initialize(view, cmd, cmdsize, name, timestamp, current_version, compatibility_version)
+      def initialize(view, cmd, cmdsize, name, timestamp, current_version,
+                     compatibility_version)
         super(view, cmd, cmdsize)
         @name = LCStr.new(self, name)
         @timestamp = timestamp
@@ -475,12 +493,15 @@ module MachO
         @compatibility_version = compatibility_version
       end
 
-      # @param context [MachO::LoadCommands::LoadCommand::SerializationContext] the context
+      # @param context [SerializationContext]
+      #  the context
       # @return [String] the serialized fields of the load command
       # @api private
       def serialize(context)
         format = Utils.specialize_format(FORMAT, context.endianness)
-        string_payload, string_offsets = Utils.pack_strings(SIZEOF, context.alignment, :name => name.to_s)
+        string_payload, string_offsets = Utils.pack_strings(SIZEOF,
+                                                            context.alignment,
+                                                            :name => name.to_s)
         cmdsize = SIZEOF + string_payload.bytesize
         [cmd, cmdsize, string_offsets[:name], timestamp, current_version,
          compatibility_version].pack(format) + string_payload
@@ -491,7 +512,8 @@ module MachO
     # on filetype. Corresponds to LC_ID_DYLINKER, LC_LOAD_DYLINKER, and
     # LC_DYLD_ENVIRONMENT.
     class DylinkerCommand < LoadCommand
-      # @return [MachO::LoadCommands::LoadCommand::LCStr] the dynamic linker's path name as an LCStr
+      # @return [LCStr] the dynamic linker's
+      #  path name as an LCStr
       attr_reader :name
 
       # @see MachOStructure::FORMAT
@@ -508,12 +530,15 @@ module MachO
         @name = LCStr.new(self, name)
       end
 
-      # @param context [MachO::LoadCommands::LoadCommand::SerializationContext] the context
+      # @param context [SerializationContext]
+      #  the context
       # @return [String] the serialized fields of the load command
       # @api private
       def serialize(context)
         format = Utils.specialize_format(FORMAT, context.endianness)
-        string_payload, string_offsets = Utils.pack_strings(SIZEOF, context.alignment, :name => name.to_s)
+        string_payload, string_offsets = Utils.pack_strings(SIZEOF,
+                                                            context.alignment,
+                                                            :name => name.to_s)
         cmdsize = SIZEOF + string_payload.bytesize
         [cmd, cmdsize, string_offsets[:name]].pack(format) + string_payload
       end
@@ -522,7 +547,8 @@ module MachO
     # A load command used to indicate dynamic libraries used in prebinding.
     # Corresponds to LC_PREBOUND_DYLIB.
     class PreboundDylibCommand < LoadCommand
-      # @return [MachO::LoadCommands::LoadCommand::LCStr] the library's path name as an LCStr
+      # @return [LCStr] the library's path
+      #  name as an LCStr
       attr_reader :name
 
       # @return [Fixnum] the number of modules in the library
@@ -549,7 +575,8 @@ module MachO
     end
 
     # A load command used to represent threads.
-    # @note cctools-870 has all fields of thread_command commented out except common ones (cmd, cmdsize)
+    # @note cctools-870 and onwards have all fields of thread_command commented
+    # out except the common ones (cmd, cmdsize)
     class ThreadCommand < LoadCommand
       # @see MachOStructure::FORMAT
       # @api private
@@ -567,7 +594,8 @@ module MachO
       # @return [Fixnum] the address of the initialization routine
       attr_reader :init_address
 
-      # @return [Fixnum] the index into the module table that the init routine is defined in
+      # @return [Fixnum] the index into the module table that the init routine
+      #  is defined in
       attr_reader :init_module
 
       # @return [void]
@@ -627,7 +655,7 @@ module MachO
     # A load command signifying membership of a subframework containing the name
     # of an umbrella framework. Corresponds to LC_SUB_FRAMEWORK.
     class SubFrameworkCommand < LoadCommand
-      # @return [MachO::LoadCommands::LoadCommand::LCStr] the umbrella framework name as an LCStr
+      # @return [LCStr] the umbrella framework name as an LCStr
       attr_reader :umbrella
 
       # @see MachOStructure::FORMAT
@@ -648,7 +676,7 @@ module MachO
     # A load command signifying membership of a subumbrella containing the name
     # of an umbrella framework. Corresponds to LC_SUB_UMBRELLA.
     class SubUmbrellaCommand < LoadCommand
-      # @return [MachO::LoadCommands::LoadCommand::LCStr] the subumbrella framework name as an LCStr
+      # @return [LCStr] the subumbrella framework name as an LCStr
       attr_reader :sub_umbrella
 
       # @see MachOStructure::FORMAT
@@ -669,7 +697,7 @@ module MachO
     # A load command signifying a sublibrary of a shared library. Corresponds
     # to LC_SUB_LIBRARY.
     class SubLibraryCommand < LoadCommand
-      # @return [MachO::LoadCommands::LoadCommand::LCStr] the sublibrary name as an LCStr
+      # @return [LCStr] the sublibrary name as an LCStr
       attr_reader :sub_library
 
       # @see MachOStructure::FORMAT
@@ -690,7 +718,7 @@ module MachO
     # A load command signifying a shared library that is a subframework of
     # an umbrella framework. Corresponds to LC_SUB_CLIENT.
     class SubClientCommand < LoadCommand
-      # @return [MachO::LoadCommands::LoadCommand::LCStr] the subclient name as an LCStr
+      # @return [LCStr] the subclient name as an LCStr
       attr_reader :sub_client
 
       # @see MachOStructure::FORMAT
@@ -843,7 +871,8 @@ module MachO
       # @return [Fixnum] the number of hints in the hint table
       attr_reader :nhints
 
-      # @return [MachO::LoadCommands::TwolevelHintsCommand::TwolevelHintTable] the hint table
+      # @return [TwolevelHintsTable]
+      #  the hint table
       attr_reader :table
 
       # @see MachOStructure::FORMAT
@@ -865,7 +894,7 @@ module MachO
       # A representation of the two-level namespace lookup hints table exposed
       # by a {TwolevelHintsCommand} (`LC_TWOLEVEL_HINTS`).
       class TwolevelHintsTable
-        # @return [Array<MachO::LoadCommands::TwoLevelHintsCommand::TwoLevelHintsTable::TwoLevelHint>] all hints in the table
+        # @return [Array<TwolevelHint>] all hints in the table
         attr_reader :hints
 
         # @param view [MachO::MachOView] the view into the current Mach-O
@@ -923,7 +952,7 @@ module MachO
     # be added to the current run path used to find @rpath prefixed dylibs.
     # Corresponds to LC_RPATH.
     class RpathCommand < LoadCommand
-      # @return [MachO::LoadCommands::LoadCommand::LCStr] the path to add to the run path as an LCStr
+      # @return [LCStr] the path to add to the run path as an LCStr
       attr_reader :path
 
       # @see MachOStructure::FORMAT
@@ -940,20 +969,23 @@ module MachO
         @path = LCStr.new(self, path)
       end
 
-      # @param context [MachO::LoadCommands::LoadCommand::SerializationContext] the context
+      # @param context [SerializationContext] the context
       # @return [String] the serialized fields of the load command
       # @api private
       def serialize(context)
         format = Utils.specialize_format(FORMAT, context.endianness)
-        string_payload, string_offsets = Utils.pack_strings(SIZEOF, context.alignment, :path => path.to_s)
+        string_payload, string_offsets = Utils.pack_strings(SIZEOF,
+                                                            context.alignment,
+                                                            :path => path.to_s)
         cmdsize = SIZEOF + string_payload.bytesize
         [cmd, cmdsize, string_offsets[:path]].pack(format) + string_payload
       end
     end
 
     # A load command representing the offsets and sizes of a blob of data in
-    # the __LINKEDIT segment. Corresponds to LC_CODE_SIGNATURE, LC_SEGMENT_SPLIT_INFO,
-    # LC_FUNCTION_STARTS, LC_DATA_IN_CODE, LC_DYLIB_CODE_SIGN_DRS, and LC_LINKER_OPTIMIZATION_HINT.
+    # the __LINKEDIT segment. Corresponds to LC_CODE_SIGNATURE,
+    # LC_SEGMENT_SPLIT_INFO, LC_FUNCTION_STARTS, LC_DATA_IN_CODE,
+    # LC_DYLIB_CODE_SIGN_DRS, and LC_LINKER_OPTIMIZATION_HINT.
     class LinkeditDataCommand < LoadCommand
       # @return [Fixnum] offset to the data in the __LINKEDIT segment
       attr_reader :dataoff
@@ -1040,7 +1072,8 @@ module MachO
     end
 
     # A load command containing the minimum OS version on which the binary
-    # was built to run. Corresponds to LC_VERSION_MIN_MACOSX and LC_VERSION_MIN_IPHONEOS.
+    # was built to run. Corresponds to LC_VERSION_MIN_MACOSX and
+    # LC_VERSION_MIN_IPHONEOS.
     class VersionMinCommand < LoadCommand
       # @return [Fixnum] the version X.Y.Z packed as x16.y8.z8
       attr_reader :version
@@ -1249,9 +1282,9 @@ module MachO
       end
     end
 
-    # An obsolete load command containing a free format string table. Each string
-    # is null-terminated and the command is zero-padded to a multiple of 4.
-    # Corresponds to LC_IDENT.
+    # An obsolete load command containing a free format string table. Each
+    # string is null-terminated and the command is zero-padded to a multiple of
+    # 4. Corresponds to LC_IDENT.
     class IdentCommand < LoadCommand
       # @see MachOStructure::FORMAT
       # @api private
@@ -1265,7 +1298,7 @@ module MachO
     # An obsolete load command containing the path to a file to be loaded into
     # memory. Corresponds to LC_FVMFILE.
     class FvmfileCommand < LoadCommand
-      # @return [MachO::LoadCommands::LoadCommand::LCStr] the pathname of the file being loaded
+      # @return [LCStr] the pathname of the file being loaded
       attr_reader :name
 
       # @return [Fixnum] the virtual address being loaded at
@@ -1286,10 +1319,10 @@ module MachO
       end
     end
 
-    # An obsolete load command containing the path to a library to be loaded into
-    # memory. Corresponds to LC_LOADFVMLIB and LC_IDFVMLIB.
+    # An obsolete load command containing the path to a library to be loaded
+    # into memory. Corresponds to LC_LOADFVMLIB and LC_IDFVMLIB.
     class FvmlibCommand < LoadCommand
-      # @return [MachO::LoadCommands::LoadCommand::LCStr] the library's target pathname
+      # @return [LCStr] the library's target pathname
       attr_reader :name
 
       # @return [Fixnum] the library's minor version number

data/lib/macho/macho_file.rb

@@ -1,27 +1,33 @@
+require "forwardable"
+
 module MachO
   # Represents a Mach-O file, which contains a header and load commands
   # as well as binary executable instructions. Mach-O binaries are
   # architecture specific.
   # @see https://en.wikipedia.org/wiki/Mach-O
-  # @see MachO::FatFile
+  # @see FatFile
   class MachOFile
-    # @return [String] the filename loaded from, or nil if loaded from a binary string
+    extend Forwardable
+
+    # @return [String] the filename loaded from, or nil if loaded from a binary
+    #  string
     attr_accessor :filename
 
     # @return [Symbol] the endianness of the file, :big or :little
     attr_reader :endianness
 
-    # @return [MachO::Headers::MachHeader] if the Mach-O is 32-bit
-    # @return [MachO::Headers::MachHeader64] if the Mach-O is 64-bit
+    # @return [Headers::MachHeader] if the Mach-O is 32-bit
+    # @return [Headers::MachHeader64] if the Mach-O is 64-bit
     attr_reader :header
 
-    # @return [Array<MachO::LoadCommands::LoadCommand>] an array of the file's load commands
+    # @return [Array<LoadCommands::LoadCommand>] an array of the file's load
+    #  commands
     # @note load commands are provided in order of ascending offset.
     attr_reader :load_commands
 
     # Creates a new MachOFile instance from a binary string.
     # @param bin [String] a binary string containing raw Mach-O data
-    # @return [MachO::MachOFile] a new MachOFile
+    # @return [MachOFile] a new MachOFile
     def self.new_from_bin(bin)
       instance = allocate
       instance.initialize_from_bin(bin)
@@ -55,75 +61,44 @@ module MachO
       @raw_data
     end
 
-    # @return [Boolean] true if the Mach-O has 32-bit magic, false otherwise
-    def magic32?
-      Utils.magic32?(header.magic)
-    end
-
-    # @return [Boolean] true if the Mach-O has 64-bit magic, false otherwise
-    def magic64?
-      Utils.magic64?(header.magic)
-    end
-
-    # @return [Fixnum] the file's internal alignment
-    def alignment
-      magic32? ? 4 : 8
-    end
-
-    # @return [Boolean] true if the file is of type `MH_OBJECT`, false otherwise
-    def object?
-      header.filetype == Headers::MH_OBJECT
-    end
-
-    # @return [Boolean] true if the file is of type `MH_EXECUTE`, false otherwise
-    def executable?
-      header.filetype == Headers::MH_EXECUTE
-    end
-
-    # @return [Boolean] true if the file is of type `MH_FVMLIB`, false otherwise
-    def fvmlib?
-      header.filetype == Headers::MH_FVMLIB
-    end
-
-    # @return [Boolean] true if the file is of type `MH_CORE`, false otherwise
-    def core?
-      header.filetype == Headers::MH_CORE
-    end
-
-    # @return [Boolean] true if the file is of type `MH_PRELOAD`, false otherwise
-    def preload?
-      header.filetype == Headers::MH_PRELOAD
-    end
-
-    # @return [Boolean] true if the file is of type `MH_DYLIB`, false otherwise
-    def dylib?
-      header.filetype == Headers::MH_DYLIB
-    end
-
-    # @return [Boolean] true if the file is of type `MH_DYLINKER`, false otherwise
-    def dylinker?
-      header.filetype == Headers::MH_DYLINKER
-    end
-
-    # @return [Boolean] true if the file is of type `MH_BUNDLE`, false otherwise
-    def bundle?
-      header.filetype == Headers::MH_BUNDLE
-    end
-
-    # @return [Boolean] true if the file is of type `MH_DSYM`, false otherwise
-    def dsym?
-      header.filetype == Headers::MH_DSYM
-    end
-
-    # @return [Boolean] true if the file is of type `MH_KEXT_BUNDLE`, false otherwise
-    def kext?
-      header.filetype == Headers::MH_KEXT_BUNDLE
-    end
-
-    # @return [Fixnum] the file's magic number
-    def magic
-      header.magic
-    end
+    # @!method magic
+    #  @return (see MachO::Headers::MachHeader#magic)
+    # @!method ncmds
+    #  @return (see MachO::Headers::MachHeader#ncmds)
+    # @!method sizeofcmds
+    #  @return (see MachO::Headers::MachHeader#sizeofcmds)
+    # @!method flags
+    #  @return (see MachO::Headers::MachHeader#flags)
+    # @!method object?
+    #  @return (see MachO::Headers::MachHeader#object?)
+    # @!method executable?
+    #  @return (see MachO::Headers::MachHeader#executable?)
+    # @!method fvmlib?
+    #  @return (see MachO::Headers::MachHeader#fvmlib?)
+    # @!method core?
+    #  @return (see MachO::Headers::MachHeader#core?)
+    # @!method preload?
+    #  @return (see MachO::Headers::MachHeader#preload?)
+    # @!method dylib?
+    #  @return (see MachO::Headers::MachHeader#dylib?)
+    # @!method dylinker?
+    #  @return (see MachO::Headers::MachHeader#dylinker?)
+    # @!method bundle?
+    #  @return (see MachO::Headers::MachHeader#bundle?)
+    # @!method dsym?
+    #  @return (see MachO::Headers::MachHeader#dsym?)
+    # @!method kext?
+    #  @return (see MachO::Headers::MachHeader#kext?)
+    # @!method magic32?
+    #  @return (see MachO::Headers::MachHeader#magic32?)
+    # @!method magic64?
+    #  @return (see MachO::Headers::MachHeader#magic64?)
+    # @!method alignment
+    #  @return (see MachO::Headers::MachHeader#alignment)
+    def_delegators :header, :magic, :ncmds, :sizeofcmds, :flags, :object?,
+                   :executable?, :fvmlib?, :core?, :preload?, :dylib?,
+                   :dylinker?, :bundle?, :dsym?, :kext?, :magic32?, :magic64?,
+                   :alignment
 
     # @return [String] a string representation of the file's magic number
     def magic_string
@@ -145,27 +120,13 @@ module MachO
       Headers::CPU_SUBTYPES[header.cputype][header.cpusubtype]
     end
 
-    # @return [Fixnum] the number of load commands in the Mach-O's header
-    def ncmds
-      header.ncmds
-    end
-
-    # @return [Fixnum] the size of all load commands, in bytes
-    def sizeofcmds
-      header.sizeofcmds
-    end
-
-    # @return [Fixnum] execution flags set by the linker
-    def flags
-      header.flags
-    end
-
     # All load commands of a given name.
     # @example
     #  file.command("LC_LOAD_DYLIB")
     #  file[:LC_LOAD_DYLIB]
     # @param [String, Symbol] name the load command ID
-    # @return [Array<MachO::LoadCommands::LoadCommand>] an array of load commands corresponding to `name`
+    # @return [Array<LoadCommands::LoadCommand>] an array of load commands
+    #  corresponding to `name`
     def command(name)
       load_commands.select { |lc| lc.type == name.to_sym }
     end
@@ -174,12 +135,12 @@ module MachO
 
     # Inserts a load command at the given offset.
     # @param offset [Fixnum] the offset to insert at
-    # @param lc [MachO::LoadCommands::LoadCommand] the load command to insert
+    # @param lc [LoadCommands::LoadCommand] the load command to insert
     # @param options [Hash]
     # @option options [Boolean] :repopulate (true) whether or not to repopulate
     #  the instance fields
-    # @raise [MachO::OffsetInsertionError] if the offset is not in the load command region
-    # @raise [MachO::HeaderPadError] if the new command exceeds the header pad buffer
+    # @raise [OffsetInsertionError] if the offset is not in the load command region
+    # @raise [HeaderPadError] if the new command exceeds the header pad buffer
     # @note Calling this method with an arbitrary offset in the load command
     #  region **will leave the object in an inconsistent state**.
     def insert_command(offset, lc, options = {})
@@ -207,11 +168,11 @@ module MachO
     end
 
     # Replace a load command with another command in the Mach-O, preserving location.
-    # @param old_lc [MachO::LoadCommands::LoadCommand] the load command being replaced
-    # @param new_lc [MachO::LoadCommands::LoadCommand] the load command being added
+    # @param old_lc [LoadCommands::LoadCommand] the load command being replaced
+    # @param new_lc [LoadCommands::LoadCommand] the load command being added
     # @return [void]
-    # @raise [MachO::HeaderPadError] if the new command exceeds the header pad buffer
-    # @see {#insert_command}
+    # @raise [HeaderPadError] if the new command exceeds the header pad buffer
+    # @see #insert_command
     # @note This is public, but methods like {#dylib_id=} should be preferred.
     def replace_command(old_lc, new_lc)
       context = LoadCommands::LoadCommand::SerializationContext.context_for(self)
@@ -226,12 +187,12 @@ module MachO
     end
 
     # Appends a new load command to the Mach-O.
-    # @param lc [MachO::LoadCommands::LoadCommand] the load command being added
+    # @param lc [LoadCommands::LoadCommand] the load command being added
     # @param options [Hash]
     # @option options [Boolean] :repopulate (true) whether or not to repopulate
     #  the instance fields
     # @return [void]
-    # @see {#insert_command}
+    # @see #insert_command
     # @note This is public, but methods like {#add_rpath} should be preferred.
     #  Setting `repopulate` to false **will leave the instance in an
     #  inconsistent state** unless {#populate_fields} is called **immediately**
@@ -241,7 +202,7 @@ module MachO
     end
 
     # Delete a load command from the Mach-O.
-    # @param lc [MachO::LoadCommands::LoadCommand] the load command being deleted
+    # @param lc [LoadCommands::LoadCommand] the load command being deleted
     # @param options [Hash]
     # @option options [Boolean] :repopulate (true) whether or not to repopulate
     #  the instance fields
@@ -275,14 +236,14 @@ module MachO
     end
 
     # All load commands responsible for loading dylibs.
-    # @return [Array<MachO::LoadCommands::DylibCommand>] an array of DylibCommands
+    # @return [Array<LoadCommands::DylibCommand>] an array of DylibCommands
     def dylib_load_commands
       load_commands.select { |lc| LoadCommands::DYLIB_LOAD_COMMANDS.include?(lc.type) }
     end
 
     # All segment load commands in the Mach-O.
-    # @return [Array<MachO::LoadCommands::SegmentCommand>] if the Mach-O is 32-bit
-    # @return [Array<MachO::LoadCommands::SegmentCommand64>] if the Mach-O is 64-bit
+    # @return [Array<LoadCommands::SegmentCommand>] if the Mach-O is 32-bit
+    # @return [Array<LoadCommands::SegmentCommand64>] if the Mach-O is 64-bit
     def segments
       if magic32?
         command(:LC_SEGMENT)
@@ -341,12 +302,12 @@ module MachO
 
     # Changes the shared library `old_name` to `new_name`
     # @example
-    #  file.change_install_name("/usr/lib/libWhatever.dylib", "/usr/local/lib/libWhatever2.dylib")
+    #  file.change_install_name("abc.dylib", "def.dylib")
     # @param old_name [String] the shared library's old name
     # @param new_name [String] the shared library's new name
     # @param _options [Hash]
     # @return [void]
-    # @raise [MachO::DylibUnknownError] if no shared library has the old name
+    # @raise [DylibUnknownError] if no shared library has the old name
     # @note `_options` is currently unused and is provided for signature
     #  compatibility with {MachO::FatFile#change_install_name}
     def change_install_name(old_name, new_name, _options = {})
@@ -376,8 +337,8 @@ module MachO
     # @param new_path [String] the new runtime path
     # @param _options [Hash]
     # @return [void]
-    # @raise [MachO::RpathUnknownError] if no such old runtime path exists
-    # @raise [MachO::RpathExistsError] if the new runtime path already exists
+    # @raise [RpathUnknownError] if no such old runtime path exists
+    # @raise [RpathExistsError] if the new runtime path already exists
     # @note `_options` is currently unused and is provided for signature
     #  compatibility with {MachO::FatFile#change_rpath}
     def change_rpath(old_path, new_path, _options = {})
@@ -399,7 +360,7 @@ module MachO
     # @param path [String] the new runtime path
     # @param _options [Hash]
     # @return [void]
-    # @raise [MachO::RpathExistsError] if the runtime path already exists
+    # @raise [RpathExistsError] if the runtime path already exists
     # @note `_options` is currently unused and is provided for signature
     #  compatibility with {MachO::FatFile#add_rpath}
     def add_rpath(path, _options = {})
@@ -417,7 +378,7 @@ module MachO
     # @param path [String] the runtime path to delete
     # @param _options [Hash]
     # @return void
-    # @raise [MachO::RpathUnknownError] if no such runtime path exists
+    # @raise [RpathUnknownError] if no such runtime path exists
     # @note `_options` is currently unused and is provided for signature
     #  compatibility with {MachO::FatFile#delete_rpath}
     def delete_rpath(path, _options = {})
@@ -431,15 +392,6 @@ module MachO
       populate_fields
     end
 
-    # All sections of the segment `segment`.
-    # @param segment [MachO::LoadCommands::SegmentCommand, MachO::LoadCommands::SegmentCommand64] the segment being inspected
-    # @return [Array<MachO::Sections::Section>] if the Mach-O is 32-bit
-    # @return [Array<MachO::Sections::Section64>] if the Mach-O is 64-bit
-    # @deprecated use {MachO::LoadCommands::SegmentCommand#sections} instead
-    def sections(segment)
-      segment.sections
-    end
-
     # Write all Mach-O data to the given filename.
     # @param filename [String] the file to write to
     # @return [void]
@@ -449,7 +401,7 @@ module MachO
 
     # Write all Mach-O data to the file used to initialize the instance.
     # @return [void]
-    # @raise [MachO::MachOError] if the instance was initialized without a file
+    # @raise [MachOError] if the instance was initialized without a file
     # @note Overwrites all data in the file!
     def write!
       if @filename.nil?
@@ -462,9 +414,9 @@ module MachO
     private
 
     # The file's Mach-O header structure.
-    # @return [MachO::Headers::MachHeader] if the Mach-O is 32-bit
-    # @return [MachO::Headers::MachHeader64] if the Mach-O is 64-bit
-    # @raise [MachO::TruncatedFileError] if the file is too small to have a valid header
+    # @return [Headers::MachHeader] if the Mach-O is 32-bit
+    # @return [Headers::MachHeader64] if the Mach-O is 64-bit
+    # @raise [TruncatedFileError] if the file is too small to have a valid header
     # @api private
     def populate_mach_header
       # the smallest Mach-O header is 28 bytes
@@ -483,8 +435,8 @@ module MachO
 
     # Read just the file's magic number and check its validity.
     # @return [Fixnum] the magic
-    # @raise [MachO::MagicError] if the magic is not valid Mach-O magic
-    # @raise [MachO::FatBinaryError] if the magic is for a Fat file
+    # @raise [MagicError] if the magic is not valid Mach-O magic
+    # @raise [FatBinaryError] if the magic is for a Fat file
     # @api private
     def populate_and_check_magic
       magic = @raw_data[0..3].unpack("N").first
@@ -499,7 +451,7 @@ module MachO
 
     # Check the file's CPU type.
     # @param cputype [Fixnum] the CPU type
-    # @raise [MachO::CPUTypeError] if the CPU type is unknown
+    # @raise [CPUTypeError] if the CPU type is unknown
     # @api private
     def check_cputype(cputype)
       raise CPUTypeError, cputype unless Headers::CPU_TYPES.key?(cputype)
@@ -507,7 +459,7 @@ module MachO
 
     # Check the file's CPU type/subtype pair.
     # @param cpusubtype [Fixnum] the CPU subtype
-    # @raise [MachO::CPUSubtypeError] if the CPU sub-type is unknown
+    # @raise [CPUSubtypeError] if the CPU sub-type is unknown
     # @api private
     def check_cpusubtype(cputype, cpusubtype)
       # Only check sub-type w/o capability bits (see `populate_mach_header`).
@@ -516,15 +468,15 @@ module MachO
 
     # Check the file's type.
     # @param filetype [Fixnum] the file type
-    # @raise [MachO::FiletypeError] if the file type is unknown
+    # @raise [FiletypeError] if the file type is unknown
     # @api private
     def check_filetype(filetype)
       raise FiletypeError, filetype unless Headers::MH_FILETYPES.key?(filetype)
     end
 
     # All load commands in the file.
-    # @return [Array<MachO::LoadCommands::LoadCommand>] an array of load commands
-    # @raise [MachO::LoadCommandError] if an unknown load command is encountered
+    # @return [Array<LoadCommands::LoadCommand>] an array of load commands
+    # @raise [LoadCommandError] if an unknown load command is encountered
     # @api private
     def populate_load_commands
       offset = header.class.bytesize
@@ -539,7 +491,7 @@ module MachO
 
         # why do I do this? i don't like declaring constants below
         # classes, and i need them to resolve...
-        klass = MachO::LoadCommands.const_get LoadCommands::LC_STRUCTURES[cmd_sym]
+        klass = LoadCommands.const_get LoadCommands::LC_STRUCTURES[cmd_sym]
         view = MachOView.new(@raw_data, endianness, offset)
         command = klass.new_from_bin(view)