Mercurial > emacs
annotate src/unexaix.c @ 68465:37d03b3298bf
The Great Cleanup
Remove circular dependencies.
mh-e.el now includes few require statements and stands alone. Other
files should need to require mh-e.el, which requires mh-loaddefs.el,
plus variable-only files such as mh-scan.el.
Remove unneeded require statements.
Remove unneeded load statements, or replace them with non-fatal
require statements.
Break out components into their own files that were often spread
between many files. As a result, many functions that are now only used
within a single file no longer need to be autoloaded.
Rearrange and provide consistent headings.
Untabify.
* mh-acros.el: Update commentary to reflect current usage. Add
autoload cookies to all macros.
(mh-require-cl): Merge docstring and comment.
(mh-do-in-xemacs): Fix typo in docstring.
(assoc-string): Move to new file mh-compat.el.
(with-mh-folder-updating, mh-in-show-buffer)
(mh-do-at-event-location, mh-seq-msgs): Move here from mh-utils.el.
(mh-iterate-on-messages-in-region, mh-iterate-on-range): Move here
from mh-seq.el.
* mh-alias.el (mh-address-mail-regexp)
(mh-goto-address-find-address-at-point): Move here from mh-utils.el.
(mh-folder-line-matches-show-buffer-p): Move here from mh-e.el.
* mh-buffers.el: Update descriptive text.
* mh-comp.el (mh-note-repl, mh-note-forw, mh-note-dist): Move to new
file mh-scan.el.
(mh-yank-hooks, mh-to-field-choices, mh-position-on-field)
(mh-letter-menu, mh-letter-mode-help-messages)
(mh-letter-buttons-init-flag, mh-letter-mode)
(mh-font-lock-field-data, mh-letter-header-end)
(mh-auto-fill-for-letter, mh-to-field, mh-to-fcc)
(mh-file-is-vcard-p, mh-insert-signature, mh-check-whom)
(mh-insert-letter, mh-extract-from-attribution, mh-yank-cur-msg)
(mh-filter-out-non-text, mh-insert-prefix-string)
(mh-current-fill-prefix, mh-open-line, mh-complete-word)
(mh-folder-expand-at-point, mh-letter-complete-function-alist)
(mh-letter-complete, mh-letter-complete-or-space)
(mh-letter-confirm-address, mh-letter-header-field-at-point)
(mh-letter-next-header-field-or-indent)
(mh-letter-next-header-field, mh-letter-previous-header-field)
(mh-letter-skipped-header-field-p)
(mh-letter-skip-leading-whitespace-in-header-field)
(mh-hidden-header-keymap)
(mh-letter-toggle-header-field-display-button)
(mh-letter-toggle-header-field-display)
(mh-letter-truncate-header-field, mh-letter-mode-map): Move to new
file mh-letter.el.
(mh-letter-mode-map, mh-sent-from-folder, mh-send-args)
(mh-pgp-support-flag, mh-x-mailer-string)
(mh-letter-header-field-regexp): Move to mh-e.el.
(mh-goto-header-field, mh-goto-header-end)
(mh-extract-from-header-value, mh-beginning-of-word): Move to
mh-utils.el.
(mh-insert-header-separator): Move to mh-comp.el.
(mh-display-completion-list-compat): Move to new file mh-compat.el.
* mh-compat.el: New file.
(assoc-string): Move here from mh-acros.el.
(mh-display-completion-list): Move here from mh-comp.el.
* mh-customize.el: Move content into mh-e.el and remove.
* mh-e.el (mh-folder-mode-map, mh-folder-seq-tool-bar-map)
(mh-folder-tool-bar-map, mh-inc-spool-map, mh-letter-mode-map)
(mh-letter-tool-bar-map, mh-search-mode-map, mh-show-mode-map)
(mh-show-seq-tool-bar-map, mh-show-tool-bar-map): All maps now
declared here so that they can be used in docstrings.
(mh-sent-from-folder, mh-sent-from-msg)
(mh-letter-header-field-regexp, mh-pgp-support-flag)
(mh-x-mailer-string): Move here from mh-comp.el.
(mh-folder-line-matches-show-buffer-p): Move to mh-alias.el.
(mh-thread-scan-line-map, mh-thread-scan-line-map-stack): Move here
from mh-seq.el.
(mh-draft-folder, mh-inbox, mh-user-path, mh-current-folder)
(mh-previous-window-config, mh-seen-list, mh-seq-list)
(mh-show-buffer, mh-showing-mode, mh-globals-hash)
(mh-show-folder-buffer, mh-mail-header-separator)
(mh-unseen-seq, mh-previous-seq, mh-page-to-next-msg-flag)
(mh-signature-separator, mh-signature-separator-regexp)
(mh-list-to-string, mh-list-to-string-1): Move here from mh-utils.el.
(mh-index-max-cmdline-args, mh-xargs, mh-quote-for-shell)
(mh-exec-cmd, mh-exec-cmd-error, mh-exec-cmd-daemon)
(mh-exec-cmd-env-daemon, mh-process-daemon, mh-exec-cmd-quiet)
(mh-exec-cmd-output)
(mh-exchange-point-and-mark-preserving-active-mark)
(mh-exec-lib-cmd-output, mh-handle-process-error): Move here from
deprecated file mh-exec.el.
(mh-path): Move here from deprecated file mh-customize.el.
(mh-sys-path, mh-variants, mh-variant-in-use, mh-progs, mh-lib)
(mh-flists-present-flag, mh-variants, mh-variant-mh-info)
(mh-variant-mu-mh-info, mh-variant-nmh-info, mh-file-command-p)
(mh-variant-set-variant, mh-variant-p, mh-profile-component)
(mh-profile-component-value, mh-defface-compat): Move here from
deprecated file mh-init.el.
(mh-goto-next-button, mh-folder-mime-action)
(mh-folder-toggle-mime-part, mh-folder-inline-mime-part)
(mh-folder-save-mime-part, mh-toggle-mime-buttons): Move to to
mh-mime.el.
(mh-scan-format-mh, mh-scan-format-nmh, mh-note-deleted)
(mh-note-refiled, mh-note-cur, mh-scan-good-msg-regexp)
(mh-scan-deleted-msg-regexp, mh-scan-refiled-msg-regexp)
(mh-scan-valid-regexp, mh-scan-cur-msg-number-regexp)
(mh-scan-date-regexp, mh-scan-rcpt-regexp, mh-scan-body-regexp)
(mh-scan-subject-regexp, mh-scan-sent-to-me-sender-regexp)
(mh-scan-cmd-note-width, mh-scan-destination-width)
(mh-scan-date-width, mh-scan-date-flag-width)
(mh-scan-from-mbox-width, mh-scan-from-mbox-sep-width)
(mh-scan-field-destination-offset)
(mh-scan-field-from-start-offset, mh-scan-field-from-end-offset)
(mh-scan-field-subject-start-offset, mh-scan-format)
(mh-msg-num-width-to-column, mh-set-cmd-note): Move to new file
mh-scan.el.
(mh-partial-folder-mode-line-annotation)
(mh-folder-font-lock-keywords, mh-folder-font-lock-subject)
(mh-generate-sequence-font-lock, mh-last-destination)
(mh-last-destination-write, mh-first-msg-num, mh-last-msg-num)
(mh-rmail, mh-nmail, mh-delete-msg, mh-delete-msg-no-motion)
(mh-execute-commands, mh-first-msg, mh-header-display)
(mh-inc-folder, mh-last-msg, mh-next-undeleted-msg)
(mh-folder-from-address, mh-prompt-for-refile-folder)
(mh-refile-msg, mh-refile-or-write-again, mh-quit, mh-page-msg)
(mh-previous-page, mh-previous-undeleted-msg)
(mh-previous-unread-msg, mh-next-button, mh-prev-button)
(mh-reset-threads-and-narrowing, mh-rescan-folder)
(mh-write-msg-to-file, mh-toggle-showing, mh-undo)
(mh-visit-folder, mh-update-sequences, mh-delete-a-msg)
(mh-refile-a-msg, mh-next-msg, mh-next-unread-msg)
(mh-set-scan-mode, mh-undo-msg, mh-make-folder)
(mh-folder-sequence-menu, mh-folder-message-menu)
(mh-folder-folder-menu, mh-remove-xemacs-horizontal-scrollbar)
(mh-write-file-functions-compat, mh-folder-mode)
(mh-restore-desktop-buffer, mh-scan-folder)
(mh-regenerate-headers, mh-generate-new-cmd-note)
(mh-get-new-mail, mh-make-folder-mode-line, mh-goto-cur-msg)
(mh-process-or-undo-commands, mh-process-commands)
(mh-update-unseen, mh-delete-scan-msgs)
(mh-outstanding-commands-p): Move to new file mh-folder.el.
(mh-mapc, mh-colors-available-p, mh-colors-in-use-p)
(mh-make-local-vars, mh-coalesce-msg-list, mh-greaterp)
(mh-lessp): Move to mh-utils.el.
(mh-parse-flist-output-line, mh-folder-size-folder)
(mh-folder-size-flist, mh-folder-size, mh-add-sequence-notation)
(mh-remove-sequence-notation, mh-remove-cur-notation)
(mh-remove-all-notation, mh-delete-seq-locally)
(mh-read-folder-sequences, mh-read-msg-list)
(mh-notate-user-sequences, mh-internal-seqs, mh-internal-seq)
(mh-valid-seq-p, mh-delete-msg-from-seq, mh-catchup)
(mh-delete-a-msg-from-seq, mh-undefine-sequence)
(mh-define-sequence, mh-seq-containing-msg): Move to mh-seq.el.
(mh-xemacs-flag)
(mh-customize, mh-e, mh-alias, mh-folder, mh-folder-selection)
(mh-identity, mh-inc, mh-junk, mh-letter, mh-ranges)
(mh-scan-line-formats, mh-search, mh-sending-mail, mh-sequences)
(mh-show, mh-speedbar, mh-thread, mh-tool-bar, mh-hooks)
(mh-faces, mh-alias-completion-ignore-case-flag)
(mh-alias-expand-aliases-flag, mh-alias-flash-on-comma)
(mh-alias-insert-file, mh-alias-insertion-location)
(mh-alias-local-users, mh-alias-local-users-prefix)
(mh-alias-passwd-gecos-comma-separator-flag)
(mh-new-messages-folders, mh-ticked-messages-folders)
(mh-large-folder, mh-recenter-summary-flag)
(mh-recursive-folders-flag, mh-sortm-args)
(mh-default-folder-for-message-function, mh-default-folder-list)
(mh-default-folder-must-exist-flag, mh-default-folder-prefix)
(mh-identity-list, mh-auto-fields-list)
(mh-auto-fields-prompt-flag, mh-identity-default)
(mh-identity-handlers, mh-inc-prog, mh-inc-spool-list)
(mh-junk-choice, mh-junk-function-alist, mh-junk-choose)
(mh-junk-background, mh-junk-disposition, mh-junk-program)
(mh-compose-insertion, mh-compose-skipped-header-fields)
(mh-compose-space-does-completion-flag)
(mh-delete-yanked-msg-window-flag)
(mh-extract-from-attribution-verb, mh-ins-buf-prefix)
(mh-letter-complete-function, mh-letter-fill-column)
(mh-mml-method-default, mh-signature-file-name)
(mh-signature-separator-flag, mh-x-face-file, mh-yank-behavior)
(mh-interpret-number-as-range-flag, mh-adaptive-cmd-note-flag)
(mh-scan-format-file-check, mh-scan-format-file)
(mh-adaptive-cmd-note-flag-check, mh-scan-prog)
(mh-search-program, mh-compose-forward-as-mime-flag)
(mh-compose-letter-function, mh-compose-prompt-flag)
(mh-forward-subject-format, mh-insert-x-mailer-flag)
(mh-redist-full-contents-flag, mh-reply-default-reply-to)
(mh-reply-show-message-flag, mh-refile-preserves-sequences-flag)
(mh-tick-seq, mh-update-sequences-after-mh-show-flag)
(mh-bury-show-buffer-flag, mh-clean-message-header-flag)
(mh-decode-mime-flag, mh-display-buttons-for-alternatives-flag)
(mh-display-buttons-for-inline-parts-flag)
(mh-do-not-confirm-flag, mh-fetch-x-image-url)
(mh-graphical-smileys-flag, mh-graphical-emphasis-flag)
(mh-highlight-citation-style)
(mh-invisible-header-fields-internal)
(mh-delay-invisible-header-generation-flag)
(mh-invisible-header-fields, mh-invisible-header-fields-default)
(mh-invisible-header-fields-compiled, mh-invisible-headers)
(mh-lpr-command-format, mh-max-inline-image-height)
(mh-max-inline-image-width, mh-mhl-format-file)
(mh-mime-save-parts-default-directory, mh-print-background-flag)
(mh-show-maximum-size, mh-show-use-goto-addr-flag)
(mh-show-use-xface-flag, mh-store-default-directory)
(mh-summary-height, mh-speed-update-interval)
(mh-show-threads-flag, mh-tool-bar-search-function)
(mh-after-commands-processed-hook, mh-alias-reloaded-hook)
(mh-before-commands-processed-hook, mh-before-quit-hook)
(mh-before-send-letter-hook, mh-delete-msg-hook)
(mh-find-path-hook, mh-folder-mode-hook, mh-forward-hook)
(mh-inc-folder-hook, mh-insert-signature-hook)
(mh-kill-folder-suppress-prompt-hooks, mh-letter-mode-hook)
(mh-mh-to-mime-hook, mh-search-mode-hook, mh-quit-hook)
(mh-refile-msg-hook, mh-show-hook, mh-show-mode-hook)
(mh-unseen-updated-hook, mh-min-colors-defined-flag)
(mh-folder-address, mh-folder-body)
(mh-folder-cur-msg-number, mh-folder-date, mh-folder-deleted)
(mh-folder-followup, mh-folder-msg-number, mh-folder-refiled)
(mh-folder-sent-to-me-hint, mh-folder-sent-to-me-sender)
(mh-folder-subject, mh-folder-tick, mh-folder-to)
(mh-search-folder, mh-letter-header-field, mh-show-cc)
(mh-show-date, mh-show-from, mh-show-header, mh-show-pgg-bad)
(mh-show-pgg-good, mh-show-pgg-unknown, mh-show-signature)
(mh-show-subject, mh-show-to, mh-show-xface, mh-speedbar-folder)
(mh-speedbar-folder-with-unseen-messages)
(mh-speedbar-selected-folder)
(mh-speedbar-selected-folder-with-unseen-messages): Move here from
deprecated file mh-customize.el.
* mh-exec.el: Move content into mh-e.el and remove.
* mh-folder.el: New file. Contains mh-folder-mode from mh-e.el
* mh-funcs.el (mh-note-copied, mh-note-printed): Move to new file
mh-scan.el.
(mh-ephem-message, mh-help, mh-prefix-help): Move to mh-utils.el.
* mh-gnus.el (mm-uu-dissect-text-parts): Add.
(mh-mail-abbrev-make-syntax-table): Move to mh-utils.el and rename to
mail-abbrev-make-syntax-table.
* mh-identity.el (mh-identity-menu): New variable for existing menu.
(mh-identity-make-menu-no-autoload): New alias for
mh-identity-make-menu which can be called from mh-e.el.
(mh-identity-list-set): Move to mh-e.el.
(mh-identity-add-menu): New function
(mh-insert-identity): Add optional argument maybe-insert so that local
variable mh-identity-local does not have to be visible.
(mh-identity-handler-default):
* mh-inc.el (mh-inc-spool-map): Move declaration to mh-e.el (with rest
of keymaps). Update key binding for ? to call mh-help with help
messages in new argument.
(mh-inc-spool-make-no-autoload): New alias for mh-inc-spool-make which
can be called from mh-e.el.
(mh-inc-spool-list-set): Simplify update of mh-inc-spool-map-help.
* mh-init.el: Move content into mh-e.el and remove.
* mh-junk.el: Update requires, untabify, and add mh-autoload cookies.
* mh-letter.el: New file. Contains mh-letter-mode from mh-comp.el.
* mh-limit.el: New file. Contains display limit commands from
mh-mime.el.
* mh-mime.el: Rearrange for consistency with other files.
(mh-buffer-data, mh-mm-inline-media-tests): Move here from
mh-utils.el.
(mh-folder-inline-mime-part, mh-folder-save-mime-part)
(mh-folder-toggle-mime-part, mh-toggle-mime-buttons)
(mh-goto-next-button): Move here from mh-e.el.
* mh-print.el: Rearrange for consistency with other files.
* mh-scan.el: New file. Contains scan line constants and utilities
from XXX, mh-funcs, mh-utils.el.
* mh-search.el: Rearrange for consistency with other files.
(mh-search-mode-map): Drop C-c C-f {dr} bindings since these fields
which don't exist in the saved header. Replace C-c C-f f with C-c C-f
m per mail-mode consistency.
(mh-search-mode): Use mh-set-help instead of setting mh-help-messages.
* mh-seq.el (mh-thread-message, mh-thread-container)
(mh-thread-id-hash, mh-thread-subject-hash, mh-thread-id-table)
(mh-thread-id-index-map, mh-thread-index-id-map)
(mh-thread-scan-line-map, mh-thread-scan-line-map-stack)
(mh-thread-subject-container-hash, mh-thread-duplicates)
(mh-thread-history, mh-thread-body-width)
(mh-thread-find-msg-subject mh-thread-initialize-hash)
(mh-thread-initialize, mh-thread-id-container)
(mh-thread-remove-parent-link, mh-thread-add-link)
(mh-thread-ancestor-p, mh-thread-get-message-container)
(mh-thread-get-message, mh-thread-canonicalize-id)
(mh-thread-prune-subject, mh-thread-container-subject)
(mh-thread-rewind-pruning, mh-thread-prune-containers)
(mh-thread-sort-containers, mh-thread-group-by-subject)
(mh-thread-process-in-reply-to, mh-thread-set-tables)
(mh-thread-update-id-index-maps, mh-thread-generate)
(mh-thread-inc, mh-thread-generate-scan-lines)
(mh-thread-parse-scan-line, mh-thread-update-scan-line-map)
(mh-thread-add-spaces, mh-thread-print-scan-lines)
(mh-thread-folder, mh-toggle-threads, mh-thread-forget-message)
(mh-thread-current-indentation-level, mh-thread-next-sibling)
(mh-thread-previous-sibling, mh-thread-immediate-ancestor)
(mh-thread-ancestor, mh-thread-find-children)
(mh-message-id-regexp, mh-thread-delete, mh-thread-refile): Move to
new file mh-thread.el.
(mh-subject-to-sequence, mh-subject-to-sequence-unthreaded)
(mh-subject-to-sequence-threaded, mh-edit-pick-expr)
(mh-pick-args-list, mh-narrow-to-subject, mh-narrow-to-from)
(mh-narrow-to-cc, mh-narrow-to-to, mh-narrow-to-header-field)
(mh-current-message-header-field, mh-narrow-to-range)
(mh-delete-subject, mh-delete-subject-or-thread): Move to new file
mh-limit.el.
(mh-iterate-on-messages-in-region, mh-iterate-on-range): Move to
mh-acros.el.
(mh-internal-seqs, mh-catchup, mh-delete-msg-from-seq)
(mh-internal-seq, mh-valid-seq-p, mh-seq-containing-msg)
(mh-define-sequence, mh-undefine-sequence)
(mh-delete-a-msg-from-seq, mh-delete-seq-locally)
(mh-folder-size, mh-folder-size-flist, mh-folder-size-folder)
(mh-parse-flist-output-line, mh-read-folder-sequences)
(mh-read-msg-list, mh-notate-user-sequences)
(mh-remove-cur-notation, mh-add-sequence-notation)
(mh-remove-sequence-notation, mh-remove-all-notation): Move here from
mh-e.el.
(mh-make-seq, mh-seq-name, mh-find-seq, mh-seq-to-msgs)
(mh-add-msgs-to-seq, mh-notate): Move here from mh-utils.el.
* mh-show.el: New file. Contains mh-show-mode from mh-utils.el.
* mh-speed.el: Rearrange for consistency with other files.
* mh-thread.el: New file. Contains threading code from mh-seq.el.
* mh-tool-bar.el: New file. Contains tool bar creation code from
deprecated file mh-customize.el.
* mh-utils.el (recursive-load-depth-limit): Remove setting. No longer
needed.
(mh-scan-msg-number-regexp, mh-scan-msg-overflow-regexp)
(mh-scan-msg-format-regexp, mh-scan-msg-format-string)
(mh-scan-msg-search-regexp, mh-cmd-note, mh-note-seq)
(mh-update-scan-format, mh-msg-num-width): Move to new file
mh-scan.el.
(mh-show-buffer-mode-line-buffer-id, mh-letter-header-font-lock)
(mh-header-field-font-lock, mh-header-to-font-lock)
(mh-header-cc-font-lock, mh-header-subject-font-lock)
(mh-show-font-lock-keywords)
(mh-show-font-lock-keywords-with-cite)
(mh-show-font-lock-fontify-region)
(mh-gnus-article-highlight-citation, mh-showing-with-headers)
(mh-start-of-uncleaned-message, mh-invalidate-show-buffer)
(mh-unvisit-file, mh-defun-show-buffer, mh-show-mode-map)
(mh-show-sequence-menu, mh-show-message-menu)
(mh-show-folder-menu, mh-show-mode, mh-show-addr)
(mh-maybe-show, mh-show, mh-show-msg, mh-show-unquote-From)
(mh-msg-folder, mh-display-msg, mh-clean-msg-header): Move to new file
mh-show.el.
(mh-mail-header-separator, mh-signature-separator-regexp)
(mh-signature-separator, mh-globals-hash, mh-user-path)
(mh-draft-folder, mh-unseen-seq, mh-previous-seq, mh-inbox)
(mh-previous-window-config, mh-current-folder mh-show-buffer)
(mh-showing-mode, mh-show-mode-map, mh-show-folder-buffer)
(mh-showing-mode, mh-seq-list, mh-seen-list, mh-summary-height)
(mh-list-to-string, mh-list-to-string-1): Move to mh-e.el.
(mh-buffer-data, mh-mm-inline-media-tests): Move to mh-mime.el.
(mh-address-mail-regexp, mh-goto-address-find-address-at-point): Move
to mh-alias.el.
(mh-letter-font-lock-keywords): Move to new file mh-letter.el.
(mh-folder-filename, mh-msg-count, mh-recenter, mh-msg-filename)
(mh-show-mouse, mh-modify, mh-goto-msg, mh-set-folder-modified-p):
Move to new file mh-folder.el.
(with-mh-folder-updating, mh-in-show-buffer)
(mh-do-at-event-location, mh-seq-msgs): Moved to mh-acros.el.
(mh-make-seq, mh-seq-name, mh-notate, mh-find-seq)
(mh-seq-to-msgs, mh-add-msgs-to-seq, mh-canonicalize-sequence): Moved
to mh-seq.el.
(mh-show-xface-function, mh-uncompface-executable, mh-face-to-png)
(mh-uncompface, mh-icontopbm, mh-face-foreground-compat)
(mh-face-background-compat, mh-face-display-function)
(mh-show-xface, mh-picon-directory-list)
(mh-picon-existing-directory-list)
(mh-picon-cache, mh-picon-image-types)
(mh-picon-set-directory-list, mh-picon-get-image)
(mh-picon-file-contents, mh-picon-generate-path)
(mh-x-image-cache-directory, mh-x-image-scaling-function)
(mh-wget-executable, mh-wget-choice, mh-wget-option)
(mh-x-image-temp-file, mh-x-image-url, mh-x-image-marker)
(mh-x-image-url-cache-file, mh-x-image-scale-with-pnm)
(mh-x-image-scale-with-convert)
(url-unreserved-chars, url-hexify-string)
(mh-x-image-url-cache-canonicalize)
(mh-x-image-set-download-state, mh-x-image-get-download-state)
(mh-x-image-url-fetch-image, mh-x-image-display)
(mh-x-image-scale-and-display, mh-x-image-url-sane-p)
(mh-x-image-url-display): Move to new file mh-xface.el.
(mh-logo-display): Call mh-image-load-path.
(mh-find-path-run, mh-find-path): Move here from deprecated file
mh-init.el.
(mh-help-messages): Now an alist of modes to an alist of messages.
(mh-set-help): New function used to set mh-help-messages
(mh-help): Adjust for new format of mh-help-messages. Add
help-messages argument.
(mh-prefix-help): Refactor to use mh-help.
(mh-coalesce-msg-list, mh-greaterp, mh-lessp): Move here from mh-e.el.
(mh-clear-sub-folders-cache): New function added to avoid exposing
mh-sub-folders-cache variable.
* mh-xface.el: New file. Contains X-Face and Face header field display
routines from mh-utils.el.
author | Bill Wohler <wohler@newt.com> |
---|---|
date | Sun, 29 Jan 2006 19:34:57 +0000 |
parents | a0d1312ede66 |
children | 3bd95f4f2941 2d92f5c9d6ae |
rev | line source |
---|---|
25564
d0383ec2061e
New version incorporating Michael Sperber's changes from XEmacs.
Dave Love <fx@gnu.org>
parents:
19924
diff
changeset
|
1 /* Dump an executable image. |
64770
a0d1312ede66
Update years in copyright notice; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
64084
diff
changeset
|
2 Copyright (C) 1985, 1986, 1987, 1988, 1999, 2002, 2003, 2004, |
a0d1312ede66
Update years in copyright notice; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
64084
diff
changeset
|
3 2005 Free Software Foundation, Inc. |
560 | 4 |
14186
ee40177f6c68
Update FSF's address in the preamble.
Erik Naggum <erik@naggum.no>
parents:
12244
diff
changeset
|
5 This file is part of GNU Emacs. |
ee40177f6c68
Update FSF's address in the preamble.
Erik Naggum <erik@naggum.no>
parents:
12244
diff
changeset
|
6 |
ee40177f6c68
Update FSF's address in the preamble.
Erik Naggum <erik@naggum.no>
parents:
12244
diff
changeset
|
7 GNU Emacs is free software; you can redistribute it and/or modify |
ee40177f6c68
Update FSF's address in the preamble.
Erik Naggum <erik@naggum.no>
parents:
12244
diff
changeset
|
8 it under the terms of the GNU General Public License as published by |
ee40177f6c68
Update FSF's address in the preamble.
Erik Naggum <erik@naggum.no>
parents:
12244
diff
changeset
|
9 the Free Software Foundation; either version 2, or (at your option) |
ee40177f6c68
Update FSF's address in the preamble.
Erik Naggum <erik@naggum.no>
parents:
12244
diff
changeset
|
10 any later version. |
560 | 11 |
14186
ee40177f6c68
Update FSF's address in the preamble.
Erik Naggum <erik@naggum.no>
parents:
12244
diff
changeset
|
12 GNU Emacs is distributed in the hope that it will be useful, |
ee40177f6c68
Update FSF's address in the preamble.
Erik Naggum <erik@naggum.no>
parents:
12244
diff
changeset
|
13 but WITHOUT ANY WARRANTY; without even the implied warranty of |
ee40177f6c68
Update FSF's address in the preamble.
Erik Naggum <erik@naggum.no>
parents:
12244
diff
changeset
|
14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
ee40177f6c68
Update FSF's address in the preamble.
Erik Naggum <erik@naggum.no>
parents:
12244
diff
changeset
|
15 GNU General Public License for more details. |
560 | 16 |
14186
ee40177f6c68
Update FSF's address in the preamble.
Erik Naggum <erik@naggum.no>
parents:
12244
diff
changeset
|
17 You should have received a copy of the GNU General Public License |
ee40177f6c68
Update FSF's address in the preamble.
Erik Naggum <erik@naggum.no>
parents:
12244
diff
changeset
|
18 along with GNU Emacs; see the file COPYING. If not, write to |
64084 | 19 the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, |
20 Boston, MA 02110-1301, USA. | |
560 | 21 |
22 In other words, you are welcome to use, share and improve this program. | |
23 You are forbidden to forbid anyone else to use, share and improve | |
24 what you give them. Help stamp out software-hoarding! */ | |
25 | |
117
08356dc1077c
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
110
diff
changeset
|
26 |
25564
d0383ec2061e
New version incorporating Michael Sperber's changes from XEmacs.
Dave Love <fx@gnu.org>
parents:
19924
diff
changeset
|
27 /* Originally based on the COFF unexec.c by Spencer W. Thomas. |
560 | 28 * |
25564
d0383ec2061e
New version incorporating Michael Sperber's changes from XEmacs.
Dave Love <fx@gnu.org>
parents:
19924
diff
changeset
|
29 * Subsequently hacked on by |
d0383ec2061e
New version incorporating Michael Sperber's changes from XEmacs.
Dave Love <fx@gnu.org>
parents:
19924
diff
changeset
|
30 * Bill Mann <Bill_Man@praxisint.com> |
d0383ec2061e
New version incorporating Michael Sperber's changes from XEmacs.
Dave Love <fx@gnu.org>
parents:
19924
diff
changeset
|
31 * Andrew Vignaux <Andrew.Vignaux@comp.vuw.ac.nz> |
d0383ec2061e
New version incorporating Michael Sperber's changes from XEmacs.
Dave Love <fx@gnu.org>
parents:
19924
diff
changeset
|
32 * Mike Sperber <sperber@informatik.uni-tuebingen.de> |
14782
8988aa71854e
Handle both AIX 3.2 and 4.1 bind output.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
33 * |
560 | 34 * Synopsis: |
35 * unexec (new_name, a_name, data_start, bss_start, entry_address) | |
36 * char *new_name, *a_name; | |
37 * unsigned data_start, bss_start, entry_address; | |
38 * | |
39 * Takes a snapshot of the program and makes an a.out format file in the | |
40 * file named by the string argument new_name. | |
41 * If a_name is non-NULL, the symbol table will be taken from the given file. | |
42 * On some machines, an existing a_name file is required. | |
43 * | |
25564
d0383ec2061e
New version incorporating Michael Sperber's changes from XEmacs.
Dave Love <fx@gnu.org>
parents:
19924
diff
changeset
|
44 * data_start and entry_address are ignored. |
560 | 45 * |
25564
d0383ec2061e
New version incorporating Michael Sperber's changes from XEmacs.
Dave Love <fx@gnu.org>
parents:
19924
diff
changeset
|
46 * bss_start indicates how much of the data segment is to be saved in the |
560 | 47 * a.out file and restored when the program is executed. It gives the lowest |
48 * unsaved address, and is rounded up to a page boundary. The default when 0 | |
49 * is given assumes that the entire data segment is to be stored, including | |
50 * the previous data and bss as well as any additional storage allocated with | |
25564
d0383ec2061e
New version incorporating Michael Sperber's changes from XEmacs.
Dave Love <fx@gnu.org>
parents:
19924
diff
changeset
|
51 * sbrk(2). |
560 | 52 * |
53 */ | |
54 | |
55 #ifndef emacs | |
56 #define PERROR(arg) perror (arg); return -1 | |
57 #else | |
4696
1fc792473491
Include <config.h> instead of "config.h".
Roland McGrath <roland@gnu.org>
parents:
3591
diff
changeset
|
58 #include <config.h> |
560 | 59 #define PERROR(file) report_error (file, new) |
60 #endif | |
110 | 61 |
560 | 62 #include <a.out.h> |
63 /* Define getpagesize () if the system does not. | |
64 Note that this may depend on symbols defined in a.out.h | |
65 */ | |
66 #include "getpagesize.h" | |
110 | 67 |
560 | 68 #include <sys/types.h> |
69 #include <stdio.h> | |
70 #include <sys/stat.h> | |
71 #include <errno.h> | |
25564
d0383ec2061e
New version incorporating Michael Sperber's changes from XEmacs.
Dave Love <fx@gnu.org>
parents:
19924
diff
changeset
|
72 #include <unistd.h> |
d0383ec2061e
New version incorporating Michael Sperber's changes from XEmacs.
Dave Love <fx@gnu.org>
parents:
19924
diff
changeset
|
73 #include <fcntl.h> |
110 | 74 |
25564
d0383ec2061e
New version incorporating Michael Sperber's changes from XEmacs.
Dave Love <fx@gnu.org>
parents:
19924
diff
changeset
|
75 extern char *start_of_text (void); /* Start of text */ |
d0383ec2061e
New version incorporating Michael Sperber's changes from XEmacs.
Dave Love <fx@gnu.org>
parents:
19924
diff
changeset
|
76 extern char *start_of_data (void); /* Start of initialized data */ |
110 | 77 |
560 | 78 extern int _data; |
79 extern int _text; | |
25564
d0383ec2061e
New version incorporating Michael Sperber's changes from XEmacs.
Dave Love <fx@gnu.org>
parents:
19924
diff
changeset
|
80 |
560 | 81 #include <filehdr.h> |
82 #include <aouthdr.h> | |
83 #include <scnhdr.h> | |
84 #include <syms.h> | |
25564
d0383ec2061e
New version incorporating Michael Sperber's changes from XEmacs.
Dave Love <fx@gnu.org>
parents:
19924
diff
changeset
|
85 |
560 | 86 static struct filehdr f_hdr; /* File header */ |
87 static struct aouthdr f_ohdr; /* Optional file header (a.out) */ | |
25564
d0383ec2061e
New version incorporating Michael Sperber's changes from XEmacs.
Dave Love <fx@gnu.org>
parents:
19924
diff
changeset
|
88 static long bias; /* Bias to add for growth */ |
d0383ec2061e
New version incorporating Michael Sperber's changes from XEmacs.
Dave Love <fx@gnu.org>
parents:
19924
diff
changeset
|
89 static long lnnoptr; /* Pointer to line-number info within file */ |
110 | 90 |
560 | 91 static long text_scnptr; |
92 static long data_scnptr; | |
14782
8988aa71854e
Handle both AIX 3.2 and 4.1 bind output.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
93 #define ALIGN(val, pwr) (((val) + ((1L<<(pwr))-1)) & ~((1L<<(pwr))-1)) |
560 | 94 static long load_scnptr; |
95 static long orig_load_scnptr; | |
96 static long orig_data_scnptr; | |
25564
d0383ec2061e
New version incorporating Michael Sperber's changes from XEmacs.
Dave Love <fx@gnu.org>
parents:
19924
diff
changeset
|
97 static int unrelocate_symbols (int, int, char *, char *); |
110 | 98 |
560 | 99 #ifndef MAX_SECTIONS |
100 #define MAX_SECTIONS 10 | |
101 #endif | |
110 | 102 |
25564
d0383ec2061e
New version incorporating Michael Sperber's changes from XEmacs.
Dave Love <fx@gnu.org>
parents:
19924
diff
changeset
|
103 static int adjust_lnnoptrs (int, int, char *); |
560 | 104 |
105 static int pagemask; | |
110 | 106 |
560 | 107 /* Correct an int which is the bit pattern of a pointer to a byte |
108 into an int which is the number of a byte. | |
109 This is a no-op on ordinary machines, but not on all. */ | |
110 | |
111 #ifndef ADDR_CORRECT /* Let m-*.h files override this definition */ | |
112 #define ADDR_CORRECT(x) ((char *)(x) - (char*)0) | |
113 #endif | |
114 | |
115 #ifdef emacs | |
8956
390019f3ab08
(report_error): Include reason in error message.
Karl Heuer <kwzh@gnu.org>
parents:
7867
diff
changeset
|
116 #include "lisp.h" |
110 | 117 |
25564
d0383ec2061e
New version incorporating Michael Sperber's changes from XEmacs.
Dave Love <fx@gnu.org>
parents:
19924
diff
changeset
|
118 static void |
d0383ec2061e
New version incorporating Michael Sperber's changes from XEmacs.
Dave Love <fx@gnu.org>
parents:
19924
diff
changeset
|
119 report_error (char *file, int fd) |
560 | 120 { |
121 if (fd) | |
122 close (fd); | |
8956
390019f3ab08
(report_error): Include reason in error message.
Karl Heuer <kwzh@gnu.org>
parents:
7867
diff
changeset
|
123 report_file_error ("Cannot unexec", Fcons (build_string (file), Qnil)); |
560 | 124 } |
125 #endif /* emacs */ | |
110 | 126 |
560 | 127 #define ERROR0(msg) report_error_1 (new, msg, 0, 0); return -1 |
128 #define ERROR1(msg,x) report_error_1 (new, msg, x, 0); return -1 | |
129 #define ERROR2(msg,x,y) report_error_1 (new, msg, x, y); return -1 | |
110 | 130 |
25564
d0383ec2061e
New version incorporating Michael Sperber's changes from XEmacs.
Dave Love <fx@gnu.org>
parents:
19924
diff
changeset
|
131 static void |
d0383ec2061e
New version incorporating Michael Sperber's changes from XEmacs.
Dave Love <fx@gnu.org>
parents:
19924
diff
changeset
|
132 report_error_1 (int fd, char *msg, int a1, int a2) |
110 | 133 { |
560 | 134 close (fd); |
135 #ifdef emacs | |
136 error (msg, a1, a2); | |
137 #else | |
138 fprintf (stderr, msg, a1, a2); | |
139 fprintf (stderr, "\n"); | |
140 #endif | |
141 } | |
110 | 142 |
25564
d0383ec2061e
New version incorporating Michael Sperber's changes from XEmacs.
Dave Love <fx@gnu.org>
parents:
19924
diff
changeset
|
143 static int make_hdr (int, int, unsigned, unsigned, unsigned, char *, char *); |
d0383ec2061e
New version incorporating Michael Sperber's changes from XEmacs.
Dave Love <fx@gnu.org>
parents:
19924
diff
changeset
|
144 static void mark_x (char *); |
d0383ec2061e
New version incorporating Michael Sperber's changes from XEmacs.
Dave Love <fx@gnu.org>
parents:
19924
diff
changeset
|
145 static int copy_text_and_data (int); |
d0383ec2061e
New version incorporating Michael Sperber's changes from XEmacs.
Dave Love <fx@gnu.org>
parents:
19924
diff
changeset
|
146 static int copy_sym (int, int, char *, char *); |
d0383ec2061e
New version incorporating Michael Sperber's changes from XEmacs.
Dave Love <fx@gnu.org>
parents:
19924
diff
changeset
|
147 static void write_segment (int, char *, char *); |
560 | 148 |
149 /* **************************************************************** | |
150 * unexec | |
151 * | |
152 * driving logic. | |
153 */ | |
25564
d0383ec2061e
New version incorporating Michael Sperber's changes from XEmacs.
Dave Love <fx@gnu.org>
parents:
19924
diff
changeset
|
154 int unexec (char *new_name, char *a_name, |
26556
9698de836607
(unexec): Use unsigned instead of uintptr_t because
Gerd Moellmann <gerd@gnu.org>
parents:
25564
diff
changeset
|
155 unsigned data_start, |
9698de836607
(unexec): Use unsigned instead of uintptr_t because
Gerd Moellmann <gerd@gnu.org>
parents:
25564
diff
changeset
|
156 unsigned bss_start, |
9698de836607
(unexec): Use unsigned instead of uintptr_t because
Gerd Moellmann <gerd@gnu.org>
parents:
25564
diff
changeset
|
157 unsigned entry_address) |
560 | 158 { |
25564
d0383ec2061e
New version incorporating Michael Sperber's changes from XEmacs.
Dave Love <fx@gnu.org>
parents:
19924
diff
changeset
|
159 int new = -1, a_out = -1; |
560 | 160 |
25564
d0383ec2061e
New version incorporating Michael Sperber's changes from XEmacs.
Dave Love <fx@gnu.org>
parents:
19924
diff
changeset
|
161 if (a_name && (a_out = open (a_name, O_RDONLY)) < 0) |
110 | 162 { |
560 | 163 PERROR (a_name); |
164 } | |
165 if ((new = creat (new_name, 0666)) < 0) | |
166 { | |
167 PERROR (new_name); | |
110 | 168 } |
25564
d0383ec2061e
New version incorporating Michael Sperber's changes from XEmacs.
Dave Love <fx@gnu.org>
parents:
19924
diff
changeset
|
169 if (make_hdr (new, a_out, |
d0383ec2061e
New version incorporating Michael Sperber's changes from XEmacs.
Dave Love <fx@gnu.org>
parents:
19924
diff
changeset
|
170 data_start, bss_start, |
d0383ec2061e
New version incorporating Michael Sperber's changes from XEmacs.
Dave Love <fx@gnu.org>
parents:
19924
diff
changeset
|
171 entry_address, |
d0383ec2061e
New version incorporating Michael Sperber's changes from XEmacs.
Dave Love <fx@gnu.org>
parents:
19924
diff
changeset
|
172 a_name, new_name) < 0 |
560 | 173 || copy_text_and_data (new) < 0 |
174 || copy_sym (new, a_out, a_name, new_name) < 0 | |
175 || adjust_lnnoptrs (new, a_out, new_name) < 0 | |
25564
d0383ec2061e
New version incorporating Michael Sperber's changes from XEmacs.
Dave Love <fx@gnu.org>
parents:
19924
diff
changeset
|
176 || unrelocate_symbols (new, a_out, a_name, new_name) < 0) |
110 | 177 { |
560 | 178 close (new); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
26556
diff
changeset
|
179 return -1; |
110 | 180 } |
181 | |
560 | 182 close (new); |
183 if (a_out >= 0) | |
184 close (a_out); | |
185 mark_x (new_name); | |
186 return 0; | |
187 } | |
188 | |
189 /* **************************************************************** | |
190 * make_hdr | |
191 * | |
192 * Make the header in the new a.out from the header in core. | |
193 * Modify the text and data sizes. | |
194 */ | |
195 static int | |
25564
d0383ec2061e
New version incorporating Michael Sperber's changes from XEmacs.
Dave Love <fx@gnu.org>
parents:
19924
diff
changeset
|
196 make_hdr (int new, int a_out, |
d0383ec2061e
New version incorporating Michael Sperber's changes from XEmacs.
Dave Love <fx@gnu.org>
parents:
19924
diff
changeset
|
197 unsigned data_start, unsigned bss_start, |
d0383ec2061e
New version incorporating Michael Sperber's changes from XEmacs.
Dave Love <fx@gnu.org>
parents:
19924
diff
changeset
|
198 unsigned entry_address, |
d0383ec2061e
New version incorporating Michael Sperber's changes from XEmacs.
Dave Love <fx@gnu.org>
parents:
19924
diff
changeset
|
199 char *a_name, char *new_name) |
560 | 200 { |
25564
d0383ec2061e
New version incorporating Michael Sperber's changes from XEmacs.
Dave Love <fx@gnu.org>
parents:
19924
diff
changeset
|
201 int scns; |
560 | 202 unsigned int bss_end; |
110 | 203 |
560 | 204 struct scnhdr section[MAX_SECTIONS]; |
205 struct scnhdr * f_thdr; /* Text section header */ | |
206 struct scnhdr * f_dhdr; /* Data section header */ | |
207 struct scnhdr * f_bhdr; /* Bss section header */ | |
208 struct scnhdr * f_lhdr; /* Loader section header */ | |
209 struct scnhdr * f_tchdr; /* Typechk section header */ | |
210 struct scnhdr * f_dbhdr; /* Debug section header */ | |
211 struct scnhdr * f_xhdr; /* Except section header */ | |
212 | |
213 load_scnptr = orig_load_scnptr = lnnoptr = 0; | |
214 pagemask = getpagesize () - 1; | |
215 | |
216 /* Adjust text/data boundary. */ | |
217 data_start = (long) start_of_data (); | |
218 data_start = ADDR_CORRECT (data_start); | |
219 | |
220 data_start = data_start & ~pagemask; /* (Down) to page boundary. */ | |
221 | |
222 bss_end = ADDR_CORRECT (sbrk (0)) + pagemask; | |
223 bss_end &= ~ pagemask; | |
224 /* Adjust data/bss boundary. */ | |
225 if (bss_start != 0) | |
110 | 226 { |
560 | 227 bss_start = (ADDR_CORRECT (bss_start) + pagemask); |
228 /* (Up) to page bdry. */ | |
229 bss_start &= ~ pagemask; | |
230 if (bss_start > bss_end) | |
231 { | |
232 ERROR1 ("unexec: Specified bss_start (%u) is past end of program", | |
233 bss_start); | |
234 } | |
110 | 235 } |
560 | 236 else |
237 bss_start = bss_end; | |
110 | 238 |
560 | 239 if (data_start > bss_start) /* Can't have negative data size. */ |
110 | 240 { |
560 | 241 ERROR2 ("unexec: data_start (%u) can't be greater than bss_start (%u)", |
242 data_start, bss_start); | |
110 | 243 } |
244 | |
560 | 245 /* Salvage as much info from the existing file as possible */ |
246 f_thdr = NULL; f_dhdr = NULL; f_bhdr = NULL; | |
247 f_lhdr = NULL; f_tchdr = NULL; f_dbhdr = NULL; f_xhdr = NULL; | |
248 if (a_out >= 0) | |
110 | 249 { |
560 | 250 if (read (a_out, &f_hdr, sizeof (f_hdr)) != sizeof (f_hdr)) |
251 { | |
252 PERROR (a_name); | |
253 } | |
254 if (f_hdr.f_opthdr > 0) | |
255 { | |
256 if (read (a_out, &f_ohdr, sizeof (f_ohdr)) != sizeof (f_ohdr)) | |
257 { | |
258 PERROR (a_name); | |
259 } | |
260 } | |
261 if (f_hdr.f_nscns > MAX_SECTIONS) | |
262 { | |
263 ERROR0 ("unexec: too many section headers -- increase MAX_SECTIONS"); | |
264 } | |
265 /* Loop through section headers */ | |
266 for (scns = 0; scns < f_hdr.f_nscns; scns++) { | |
267 struct scnhdr *s = §ion[scns]; | |
268 if (read (a_out, s, sizeof (*s)) != sizeof (*s)) | |
269 { | |
270 PERROR (a_name); | |
271 } | |
110 | 272 |
560 | 273 #define CHECK_SCNHDR(ptr, name, flags) \ |
274 if (strcmp(s->s_name, name) == 0) { \ | |
275 if (s->s_flags != flags) { \ | |
9181
b27c4cad21fb
(CHECK_SCNHDR, write_segment): Fix format/arg mismatch.
Karl Heuer <kwzh@gnu.org>
parents:
9037
diff
changeset
|
276 fprintf(stderr, "unexec: %lx flags where %x expected in %s section.\n", \ |
b27c4cad21fb
(CHECK_SCNHDR, write_segment): Fix format/arg mismatch.
Karl Heuer <kwzh@gnu.org>
parents:
9037
diff
changeset
|
277 (unsigned long)s->s_flags, flags, name); \ |
560 | 278 } \ |
279 if (ptr) { \ | |
280 fprintf(stderr, "unexec: duplicate section header for section %s.\n", \ | |
281 name); \ | |
282 } \ | |
283 ptr = s; \ | |
284 } | |
285 CHECK_SCNHDR(f_thdr, _TEXT, STYP_TEXT); | |
286 CHECK_SCNHDR(f_dhdr, _DATA, STYP_DATA); | |
287 CHECK_SCNHDR(f_bhdr, _BSS, STYP_BSS); | |
288 CHECK_SCNHDR(f_lhdr, _LOADER, STYP_LOADER); | |
289 CHECK_SCNHDR(f_dbhdr, _DEBUG, STYP_DEBUG); | |
290 CHECK_SCNHDR(f_tchdr, _TYPCHK, STYP_TYPCHK); | |
291 CHECK_SCNHDR(f_xhdr, _EXCEPT, STYP_EXCEPT); | |
292 } | |
293 | |
294 if (f_thdr == 0) | |
295 { | |
25564
d0383ec2061e
New version incorporating Michael Sperber's changes from XEmacs.
Dave Love <fx@gnu.org>
parents:
19924
diff
changeset
|
296 ERROR1 ("unexec: couldn't find \"%s\" section", (int) _TEXT); |
560 | 297 } |
298 if (f_dhdr == 0) | |
299 { | |
25564
d0383ec2061e
New version incorporating Michael Sperber's changes from XEmacs.
Dave Love <fx@gnu.org>
parents:
19924
diff
changeset
|
300 ERROR1 ("unexec: couldn't find \"%s\" section", (int) _DATA); |
560 | 301 } |
302 if (f_bhdr == 0) | |
110 | 303 { |
25564
d0383ec2061e
New version incorporating Michael Sperber's changes from XEmacs.
Dave Love <fx@gnu.org>
parents:
19924
diff
changeset
|
304 ERROR1 ("unexec: couldn't find \"%s\" section", (int) _BSS); |
560 | 305 } |
306 } | |
307 else | |
308 { | |
309 ERROR0 ("can't build a COFF file from scratch yet"); | |
310 } | |
311 orig_data_scnptr = f_dhdr->s_scnptr; | |
312 orig_load_scnptr = f_lhdr ? f_lhdr->s_scnptr : 0; | |
110 | 313 |
560 | 314 /* Now we alter the contents of all the f_*hdr variables |
315 to correspond to what we want to dump. */ | |
14782
8988aa71854e
Handle both AIX 3.2 and 4.1 bind output.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
316 |
8988aa71854e
Handle both AIX 3.2 and 4.1 bind output.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
317 /* Indicate that the reloc information is no longer valid for ld (bind); |
8988aa71854e
Handle both AIX 3.2 and 4.1 bind output.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
318 we only update it enough to fake out the exec-time loader. */ |
8988aa71854e
Handle both AIX 3.2 and 4.1 bind output.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
319 f_hdr.f_flags |= (F_RELFLG | F_EXEC); |
8988aa71854e
Handle both AIX 3.2 and 4.1 bind output.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
320 |
25564
d0383ec2061e
New version incorporating Michael Sperber's changes from XEmacs.
Dave Love <fx@gnu.org>
parents:
19924
diff
changeset
|
321 f_ohdr.dsize = bss_start - f_ohdr.data_start; |
560 | 322 f_ohdr.bsize = bss_end - bss_start; |
110 | 323 |
560 | 324 f_dhdr->s_size = f_ohdr.dsize; |
325 f_bhdr->s_size = f_ohdr.bsize; | |
14782
8988aa71854e
Handle both AIX 3.2 and 4.1 bind output.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
326 f_bhdr->s_paddr = f_ohdr.data_start + f_ohdr.dsize; |
8988aa71854e
Handle both AIX 3.2 and 4.1 bind output.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
327 f_bhdr->s_vaddr = f_ohdr.data_start + f_ohdr.dsize; |
560 | 328 |
329 /* fix scnptr's */ | |
330 { | |
14782
8988aa71854e
Handle both AIX 3.2 and 4.1 bind output.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
331 ulong ptr = section[0].s_scnptr; |
560 | 332 |
14782
8988aa71854e
Handle both AIX 3.2 and 4.1 bind output.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
333 bias = -1; |
8988aa71854e
Handle both AIX 3.2 and 4.1 bind output.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
334 for (scns = 0; scns < f_hdr.f_nscns; scns++) |
8988aa71854e
Handle both AIX 3.2 and 4.1 bind output.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
335 { |
8988aa71854e
Handle both AIX 3.2 and 4.1 bind output.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
336 struct scnhdr *s = §ion[scns]; |
110 | 337 |
14782
8988aa71854e
Handle both AIX 3.2 and 4.1 bind output.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
338 if (s->s_flags & STYP_PAD) /* .pad sections omitted in AIX 4.1 */ |
8988aa71854e
Handle both AIX 3.2 and 4.1 bind output.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
339 { |
8988aa71854e
Handle both AIX 3.2 and 4.1 bind output.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
340 /* |
8988aa71854e
Handle both AIX 3.2 and 4.1 bind output.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
341 * the text_start should probably be o_algntext but that doesn't |
8988aa71854e
Handle both AIX 3.2 and 4.1 bind output.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
342 * seem to change |
8988aa71854e
Handle both AIX 3.2 and 4.1 bind output.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
343 */ |
8988aa71854e
Handle both AIX 3.2 and 4.1 bind output.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
344 if (f_ohdr.text_start != 0) /* && scns != 0 */ |
8988aa71854e
Handle both AIX 3.2 and 4.1 bind output.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
345 { |
8988aa71854e
Handle both AIX 3.2 and 4.1 bind output.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
346 s->s_size = 512 - (ptr % 512); |
8988aa71854e
Handle both AIX 3.2 and 4.1 bind output.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
347 if (s->s_size == 512) |
8988aa71854e
Handle both AIX 3.2 and 4.1 bind output.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
348 s->s_size = 0; |
8988aa71854e
Handle both AIX 3.2 and 4.1 bind output.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
349 } |
8988aa71854e
Handle both AIX 3.2 and 4.1 bind output.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
350 s->s_scnptr = ptr; |
8988aa71854e
Handle both AIX 3.2 and 4.1 bind output.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
351 } |
8988aa71854e
Handle both AIX 3.2 and 4.1 bind output.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
352 else if (s->s_flags & STYP_DATA) |
8988aa71854e
Handle both AIX 3.2 and 4.1 bind output.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
353 s->s_scnptr = ptr; |
8988aa71854e
Handle both AIX 3.2 and 4.1 bind output.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
354 else if (!(s->s_flags & (STYP_TEXT | STYP_BSS))) |
8988aa71854e
Handle both AIX 3.2 and 4.1 bind output.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
355 { |
8988aa71854e
Handle both AIX 3.2 and 4.1 bind output.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
356 if (bias == -1) /* if first section after bss */ |
8988aa71854e
Handle both AIX 3.2 and 4.1 bind output.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
357 bias = ptr - s->s_scnptr; |
110 | 358 |
14782
8988aa71854e
Handle both AIX 3.2 and 4.1 bind output.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
359 s->s_scnptr += bias; |
8988aa71854e
Handle both AIX 3.2 and 4.1 bind output.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
360 ptr = s->s_scnptr; |
8988aa71854e
Handle both AIX 3.2 and 4.1 bind output.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
361 } |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
26556
diff
changeset
|
362 |
14782
8988aa71854e
Handle both AIX 3.2 and 4.1 bind output.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
363 ptr = ptr + s->s_size; |
8988aa71854e
Handle both AIX 3.2 and 4.1 bind output.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
364 } |
560 | 365 } |
366 | |
367 /* fix other pointers */ | |
14782
8988aa71854e
Handle both AIX 3.2 and 4.1 bind output.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
368 for (scns = 0; scns < f_hdr.f_nscns; scns++) |
8988aa71854e
Handle both AIX 3.2 and 4.1 bind output.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
369 { |
8988aa71854e
Handle both AIX 3.2 and 4.1 bind output.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
370 struct scnhdr *s = §ion[scns]; |
560 | 371 |
14782
8988aa71854e
Handle both AIX 3.2 and 4.1 bind output.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
372 if (s->s_relptr != 0) |
8988aa71854e
Handle both AIX 3.2 and 4.1 bind output.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
373 { |
8988aa71854e
Handle both AIX 3.2 and 4.1 bind output.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
374 s->s_relptr += bias; |
8988aa71854e
Handle both AIX 3.2 and 4.1 bind output.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
375 } |
8988aa71854e
Handle both AIX 3.2 and 4.1 bind output.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
376 if (s->s_lnnoptr != 0) |
8988aa71854e
Handle both AIX 3.2 and 4.1 bind output.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
377 { |
8988aa71854e
Handle both AIX 3.2 and 4.1 bind output.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
378 if (lnnoptr == 0) lnnoptr = s->s_lnnoptr; |
8988aa71854e
Handle both AIX 3.2 and 4.1 bind output.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
379 s->s_lnnoptr += bias; |
8988aa71854e
Handle both AIX 3.2 and 4.1 bind output.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
380 } |
8988aa71854e
Handle both AIX 3.2 and 4.1 bind output.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
381 } |
110 | 382 |
560 | 383 if (f_hdr.f_symptr > 0L) |
384 { | |
385 f_hdr.f_symptr += bias; | |
386 } | |
110 | 387 |
560 | 388 text_scnptr = f_thdr->s_scnptr; |
389 data_scnptr = f_dhdr->s_scnptr; | |
390 load_scnptr = f_lhdr ? f_lhdr->s_scnptr : 0; | |
110 | 391 |
560 | 392 if (write (new, &f_hdr, sizeof (f_hdr)) != sizeof (f_hdr)) |
393 { | |
394 PERROR (new_name); | |
395 } | |
396 | |
397 if (f_hdr.f_opthdr > 0) | |
398 { | |
399 if (write (new, &f_ohdr, sizeof (f_ohdr)) != sizeof (f_ohdr)) | |
110 | 400 { |
560 | 401 PERROR (new_name); |
110 | 402 } |
403 } | |
404 | |
560 | 405 for (scns = 0; scns < f_hdr.f_nscns; scns++) { |
406 struct scnhdr *s = §ion[scns]; | |
407 if (write (new, s, sizeof (*s)) != sizeof (*s)) | |
408 { | |
409 PERROR (new_name); | |
410 } | |
411 } | |
412 | |
413 return (0); | |
414 } | |
415 | |
416 /* **************************************************************** | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
26556
diff
changeset
|
417 |
560 | 418 * |
419 * Copy the text and data segments from memory to the new a.out | |
420 */ | |
421 static int | |
25564
d0383ec2061e
New version incorporating Michael Sperber's changes from XEmacs.
Dave Love <fx@gnu.org>
parents:
19924
diff
changeset
|
422 copy_text_and_data (int new) |
560 | 423 { |
25564
d0383ec2061e
New version incorporating Michael Sperber's changes from XEmacs.
Dave Love <fx@gnu.org>
parents:
19924
diff
changeset
|
424 char *end; |
d0383ec2061e
New version incorporating Michael Sperber's changes from XEmacs.
Dave Love <fx@gnu.org>
parents:
19924
diff
changeset
|
425 char *ptr; |
560 | 426 |
25564
d0383ec2061e
New version incorporating Michael Sperber's changes from XEmacs.
Dave Love <fx@gnu.org>
parents:
19924
diff
changeset
|
427 lseek (new, (long) text_scnptr, SEEK_SET); |
560 | 428 ptr = start_of_text () + text_scnptr; |
429 end = ptr + f_ohdr.tsize; | |
430 write_segment (new, ptr, end); | |
431 | |
25564
d0383ec2061e
New version incorporating Michael Sperber's changes from XEmacs.
Dave Love <fx@gnu.org>
parents:
19924
diff
changeset
|
432 lseek (new, (long) data_scnptr, SEEK_SET); |
d0383ec2061e
New version incorporating Michael Sperber's changes from XEmacs.
Dave Love <fx@gnu.org>
parents:
19924
diff
changeset
|
433 ptr = (char *) f_ohdr.data_start; |
560 | 434 end = ptr + f_ohdr.dsize; |
435 write_segment (new, ptr, end); | |
436 | |
437 return 0; | |
110 | 438 } |
439 | |
14787
0c751a0e86cd
(write_segment,copy_sym): Increase blocking from 128 to 4k bytes.
Richard M. Stallman <rms@gnu.org>
parents:
14782
diff
changeset
|
440 #define UnexBlockSz (1<<12) /* read/write block size */ |
25564
d0383ec2061e
New version incorporating Michael Sperber's changes from XEmacs.
Dave Love <fx@gnu.org>
parents:
19924
diff
changeset
|
441 static void |
d0383ec2061e
New version incorporating Michael Sperber's changes from XEmacs.
Dave Love <fx@gnu.org>
parents:
19924
diff
changeset
|
442 write_segment (int new, char *ptr, char *end) |
560 | 443 { |
25564
d0383ec2061e
New version incorporating Michael Sperber's changes from XEmacs.
Dave Love <fx@gnu.org>
parents:
19924
diff
changeset
|
444 int i, nwrite, ret; |
560 | 445 char buf[80]; |
446 extern int errno; | |
14787
0c751a0e86cd
(write_segment,copy_sym): Increase blocking from 128 to 4k bytes.
Richard M. Stallman <rms@gnu.org>
parents:
14782
diff
changeset
|
447 char zeros[UnexBlockSz]; |
110 | 448 |
560 | 449 for (i = 0; ptr < end;) |
450 { | |
14787
0c751a0e86cd
(write_segment,copy_sym): Increase blocking from 128 to 4k bytes.
Richard M. Stallman <rms@gnu.org>
parents:
14782
diff
changeset
|
451 /* distance to next block. */ |
0c751a0e86cd
(write_segment,copy_sym): Increase blocking from 128 to 4k bytes.
Richard M. Stallman <rms@gnu.org>
parents:
14782
diff
changeset
|
452 nwrite = (((int) ptr + UnexBlockSz) & -UnexBlockSz) - (int) ptr; |
560 | 453 /* But not beyond specified end. */ |
454 if (nwrite > end - ptr) nwrite = end - ptr; | |
455 ret = write (new, ptr, nwrite); | |
456 /* If write gets a page fault, it means we reached | |
457 a gap between the old text segment and the old data segment. | |
458 This gap has probably been remapped into part of the text segment. | |
459 So write zeros for it. */ | |
460 if (ret == -1 && errno == EFAULT) | |
461 { | |
25564
d0383ec2061e
New version incorporating Michael Sperber's changes from XEmacs.
Dave Love <fx@gnu.org>
parents:
19924
diff
changeset
|
462 memset (zeros, 0, nwrite); |
14787
0c751a0e86cd
(write_segment,copy_sym): Increase blocking from 128 to 4k bytes.
Richard M. Stallman <rms@gnu.org>
parents:
14782
diff
changeset
|
463 write (new, zeros, nwrite); |
560 | 464 } |
465 else if (nwrite != ret) | |
466 { | |
467 sprintf (buf, | |
9181
b27c4cad21fb
(CHECK_SCNHDR, write_segment): Fix format/arg mismatch.
Karl Heuer <kwzh@gnu.org>
parents:
9037
diff
changeset
|
468 "unexec write failure: addr 0x%lx, fileno %d, size 0x%x, wrote 0x%x, errno %d", |
b27c4cad21fb
(CHECK_SCNHDR, write_segment): Fix format/arg mismatch.
Karl Heuer <kwzh@gnu.org>
parents:
9037
diff
changeset
|
469 (unsigned long)ptr, new, nwrite, ret, errno); |
560 | 470 PERROR (buf); |
471 } | |
472 i += nwrite; | |
473 ptr += nwrite; | |
474 } | |
475 } | |
476 | |
477 /* **************************************************************** | |
478 * copy_sym | |
479 * | |
480 * Copy the relocation information and symbol table from the a.out to the new | |
481 */ | |
482 static int | |
25564
d0383ec2061e
New version incorporating Michael Sperber's changes from XEmacs.
Dave Love <fx@gnu.org>
parents:
19924
diff
changeset
|
483 copy_sym (int new, int a_out, char *a_name, char *new_name) |
110 | 484 { |
14787
0c751a0e86cd
(write_segment,copy_sym): Increase blocking from 128 to 4k bytes.
Richard M. Stallman <rms@gnu.org>
parents:
14782
diff
changeset
|
485 char page[UnexBlockSz]; |
560 | 486 int n; |
487 | |
488 if (a_out < 0) | |
489 return 0; | |
490 | |
14782
8988aa71854e
Handle both AIX 3.2 and 4.1 bind output.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
491 if (orig_load_scnptr == 0L) |
560 | 492 return 0; |
493 | |
14782
8988aa71854e
Handle both AIX 3.2 and 4.1 bind output.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
494 if (lnnoptr && lnnoptr < orig_load_scnptr) /* if there is line number info */ |
25564
d0383ec2061e
New version incorporating Michael Sperber's changes from XEmacs.
Dave Love <fx@gnu.org>
parents:
19924
diff
changeset
|
495 lseek (a_out, lnnoptr, SEEK_SET); /* start copying from there */ |
560 | 496 else |
25564
d0383ec2061e
New version incorporating Michael Sperber's changes from XEmacs.
Dave Love <fx@gnu.org>
parents:
19924
diff
changeset
|
497 lseek (a_out, orig_load_scnptr, SEEK_SET); /* Position a.out to symtab. */ |
560 | 498 |
499 while ((n = read (a_out, page, sizeof page)) > 0) | |
500 { | |
501 if (write (new, page, n) != n) | |
502 { | |
503 PERROR (new_name); | |
504 } | |
505 } | |
506 if (n < 0) | |
507 { | |
508 PERROR (a_name); | |
509 } | |
510 return 0; | |
511 } | |
512 | |
513 /* **************************************************************** | |
514 * mark_x | |
515 * | |
3591
507f64624555
Apply typo patches from Paul Eggert.
Jim Blandy <jimb@redhat.com>
parents:
560
diff
changeset
|
516 * After successfully building the new a.out, mark it executable |
560 | 517 */ |
518 static void | |
25564
d0383ec2061e
New version incorporating Michael Sperber's changes from XEmacs.
Dave Love <fx@gnu.org>
parents:
19924
diff
changeset
|
519 mark_x (char *name) |
560 | 520 { |
521 struct stat sbuf; | |
522 int um; | |
523 int new = 0; /* for PERROR */ | |
110 | 524 |
560 | 525 um = umask (777); |
526 umask (um); | |
527 if (stat (name, &sbuf) == -1) | |
528 { | |
529 PERROR (name); | |
530 } | |
531 sbuf.st_mode |= 0111 & ~um; | |
532 if (chmod (name, sbuf.st_mode) == -1) | |
533 PERROR (name); | |
534 } | |
535 | |
25564
d0383ec2061e
New version incorporating Michael Sperber's changes from XEmacs.
Dave Love <fx@gnu.org>
parents:
19924
diff
changeset
|
536 static int |
d0383ec2061e
New version incorporating Michael Sperber's changes from XEmacs.
Dave Love <fx@gnu.org>
parents:
19924
diff
changeset
|
537 adjust_lnnoptrs (int writedesc, int readdesc, char *new_name) |
560 | 538 { |
25564
d0383ec2061e
New version incorporating Michael Sperber's changes from XEmacs.
Dave Love <fx@gnu.org>
parents:
19924
diff
changeset
|
539 int nsyms; |
d0383ec2061e
New version incorporating Michael Sperber's changes from XEmacs.
Dave Love <fx@gnu.org>
parents:
19924
diff
changeset
|
540 int naux; |
d0383ec2061e
New version incorporating Michael Sperber's changes from XEmacs.
Dave Love <fx@gnu.org>
parents:
19924
diff
changeset
|
541 int new; |
560 | 542 struct syment symentry; |
543 union auxent auxentry; | |
110 | 544 |
560 | 545 if (!lnnoptr || !f_hdr.f_symptr) |
546 return 0; | |
547 | |
25564
d0383ec2061e
New version incorporating Michael Sperber's changes from XEmacs.
Dave Love <fx@gnu.org>
parents:
19924
diff
changeset
|
548 if ((new = open (new_name, O_RDWR)) < 0) |
560 | 549 { |
550 PERROR (new_name); | |
551 return -1; | |
552 } | |
553 | |
25564
d0383ec2061e
New version incorporating Michael Sperber's changes from XEmacs.
Dave Love <fx@gnu.org>
parents:
19924
diff
changeset
|
554 lseek (new, f_hdr.f_symptr, SEEK_SET); |
560 | 555 for (nsyms = 0; nsyms < f_hdr.f_nsyms; nsyms++) |
556 { | |
557 read (new, &symentry, SYMESZ); | |
14787
0c751a0e86cd
(write_segment,copy_sym): Increase blocking from 128 to 4k bytes.
Richard M. Stallman <rms@gnu.org>
parents:
14782
diff
changeset
|
558 if (symentry.n_sclass == C_BINCL || symentry.n_sclass == C_EINCL) |
0c751a0e86cd
(write_segment,copy_sym): Increase blocking from 128 to 4k bytes.
Richard M. Stallman <rms@gnu.org>
parents:
14782
diff
changeset
|
559 { |
0c751a0e86cd
(write_segment,copy_sym): Increase blocking from 128 to 4k bytes.
Richard M. Stallman <rms@gnu.org>
parents:
14782
diff
changeset
|
560 symentry.n_value += bias; |
25564
d0383ec2061e
New version incorporating Michael Sperber's changes from XEmacs.
Dave Love <fx@gnu.org>
parents:
19924
diff
changeset
|
561 lseek (new, -SYMESZ, SEEK_CUR); |
14787
0c751a0e86cd
(write_segment,copy_sym): Increase blocking from 128 to 4k bytes.
Richard M. Stallman <rms@gnu.org>
parents:
14782
diff
changeset
|
562 write (new, &symentry, SYMESZ); |
0c751a0e86cd
(write_segment,copy_sym): Increase blocking from 128 to 4k bytes.
Richard M. Stallman <rms@gnu.org>
parents:
14782
diff
changeset
|
563 } |
0c751a0e86cd
(write_segment,copy_sym): Increase blocking from 128 to 4k bytes.
Richard M. Stallman <rms@gnu.org>
parents:
14782
diff
changeset
|
564 |
14782
8988aa71854e
Handle both AIX 3.2 and 4.1 bind output.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
565 for (naux = symentry.n_numaux; naux-- != 0; ) |
560 | 566 { |
567 read (new, &auxentry, AUXESZ); | |
568 nsyms++; | |
14782
8988aa71854e
Handle both AIX 3.2 and 4.1 bind output.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
569 if (naux != 0 /* skip csect auxentry (last entry) */ |
8988aa71854e
Handle both AIX 3.2 and 4.1 bind output.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
570 && (symentry.n_sclass == C_EXT || symentry.n_sclass == C_HIDEXT)) |
8988aa71854e
Handle both AIX 3.2 and 4.1 bind output.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
571 { |
8988aa71854e
Handle both AIX 3.2 and 4.1 bind output.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
572 auxentry.x_sym.x_fcnary.x_fcn.x_lnnoptr += bias; |
25564
d0383ec2061e
New version incorporating Michael Sperber's changes from XEmacs.
Dave Love <fx@gnu.org>
parents:
19924
diff
changeset
|
573 lseek (new, -AUXESZ, SEEK_CUR); |
14782
8988aa71854e
Handle both AIX 3.2 and 4.1 bind output.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
574 write (new, &auxentry, AUXESZ); |
8988aa71854e
Handle both AIX 3.2 and 4.1 bind output.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
575 } |
560 | 576 } |
577 } | |
578 close (new); | |
25564
d0383ec2061e
New version incorporating Michael Sperber's changes from XEmacs.
Dave Love <fx@gnu.org>
parents:
19924
diff
changeset
|
579 |
d0383ec2061e
New version incorporating Michael Sperber's changes from XEmacs.
Dave Love <fx@gnu.org>
parents:
19924
diff
changeset
|
580 return 0; |
560 | 581 } |
582 | |
25564
d0383ec2061e
New version incorporating Michael Sperber's changes from XEmacs.
Dave Love <fx@gnu.org>
parents:
19924
diff
changeset
|
583 static int |
d0383ec2061e
New version incorporating Michael Sperber's changes from XEmacs.
Dave Love <fx@gnu.org>
parents:
19924
diff
changeset
|
584 unrelocate_symbols (int new, int a_out, char *a_name, char *new_name) |
560 | 585 { |
25564
d0383ec2061e
New version incorporating Michael Sperber's changes from XEmacs.
Dave Love <fx@gnu.org>
parents:
19924
diff
changeset
|
586 int i; |
560 | 587 LDHDR ldhdr; |
25564
d0383ec2061e
New version incorporating Michael Sperber's changes from XEmacs.
Dave Love <fx@gnu.org>
parents:
19924
diff
changeset
|
588 LDREL ldrel; |
14782
8988aa71854e
Handle both AIX 3.2 and 4.1 bind output.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
589 ulong t_reloc = (ulong) &_text - f_ohdr.text_start; |
25564
d0383ec2061e
New version incorporating Michael Sperber's changes from XEmacs.
Dave Love <fx@gnu.org>
parents:
19924
diff
changeset
|
590 #ifndef ALIGN_DATA_RELOC |
d0383ec2061e
New version incorporating Michael Sperber's changes from XEmacs.
Dave Love <fx@gnu.org>
parents:
19924
diff
changeset
|
591 ulong d_reloc = (ulong) &_data - f_ohdr.data_start; |
d0383ec2061e
New version incorporating Michael Sperber's changes from XEmacs.
Dave Love <fx@gnu.org>
parents:
19924
diff
changeset
|
592 #else |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
26556
diff
changeset
|
593 /* This worked (and was needed) before AIX 4.2. |
25564
d0383ec2061e
New version incorporating Michael Sperber's changes from XEmacs.
Dave Love <fx@gnu.org>
parents:
19924
diff
changeset
|
594 I have no idea why. -- Mike */ |
14782
8988aa71854e
Handle both AIX 3.2 and 4.1 bind output.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
595 ulong d_reloc = (ulong) &_data - ALIGN(f_ohdr.data_start, 2); |
25564
d0383ec2061e
New version incorporating Michael Sperber's changes from XEmacs.
Dave Love <fx@gnu.org>
parents:
19924
diff
changeset
|
596 #endif |
560 | 597 int * p; |
598 | |
599 if (load_scnptr == 0) | |
600 return 0; | |
601 | |
25564
d0383ec2061e
New version incorporating Michael Sperber's changes from XEmacs.
Dave Love <fx@gnu.org>
parents:
19924
diff
changeset
|
602 lseek (a_out, orig_load_scnptr, SEEK_SET); |
560 | 603 if (read (a_out, &ldhdr, sizeof (ldhdr)) != sizeof (ldhdr)) |
604 { | |
605 PERROR (new_name); | |
606 } | |
607 | |
608 #define SYMNDX_TEXT 0 | |
609 #define SYMNDX_DATA 1 | |
610 #define SYMNDX_BSS 2 | |
110 | 611 |
25564
d0383ec2061e
New version incorporating Michael Sperber's changes from XEmacs.
Dave Love <fx@gnu.org>
parents:
19924
diff
changeset
|
612 for (i = 0; i < ldhdr.l_nreloc; i++) |
d0383ec2061e
New version incorporating Michael Sperber's changes from XEmacs.
Dave Love <fx@gnu.org>
parents:
19924
diff
changeset
|
613 { |
d0383ec2061e
New version incorporating Michael Sperber's changes from XEmacs.
Dave Love <fx@gnu.org>
parents:
19924
diff
changeset
|
614 lseek (a_out, |
d0383ec2061e
New version incorporating Michael Sperber's changes from XEmacs.
Dave Love <fx@gnu.org>
parents:
19924
diff
changeset
|
615 orig_load_scnptr + LDHDRSZ + LDSYMSZ*ldhdr.l_nsyms + LDRELSZ*i, |
d0383ec2061e
New version incorporating Michael Sperber's changes from XEmacs.
Dave Love <fx@gnu.org>
parents:
19924
diff
changeset
|
616 SEEK_SET); |
560 | 617 |
25564
d0383ec2061e
New version incorporating Michael Sperber's changes from XEmacs.
Dave Love <fx@gnu.org>
parents:
19924
diff
changeset
|
618 if (read (a_out, &ldrel, LDRELSZ) != LDRELSZ) |
d0383ec2061e
New version incorporating Michael Sperber's changes from XEmacs.
Dave Love <fx@gnu.org>
parents:
19924
diff
changeset
|
619 { |
d0383ec2061e
New version incorporating Michael Sperber's changes from XEmacs.
Dave Love <fx@gnu.org>
parents:
19924
diff
changeset
|
620 PERROR (a_name); |
d0383ec2061e
New version incorporating Michael Sperber's changes from XEmacs.
Dave Love <fx@gnu.org>
parents:
19924
diff
changeset
|
621 } |
560 | 622 |
623 /* move the BSS loader symbols to the DATA segment */ | |
25564
d0383ec2061e
New version incorporating Michael Sperber's changes from XEmacs.
Dave Love <fx@gnu.org>
parents:
19924
diff
changeset
|
624 if (ldrel.l_symndx == SYMNDX_BSS) |
14787
0c751a0e86cd
(write_segment,copy_sym): Increase blocking from 128 to 4k bytes.
Richard M. Stallman <rms@gnu.org>
parents:
14782
diff
changeset
|
625 { |
25564
d0383ec2061e
New version incorporating Michael Sperber's changes from XEmacs.
Dave Love <fx@gnu.org>
parents:
19924
diff
changeset
|
626 ldrel.l_symndx = SYMNDX_DATA; |
560 | 627 |
628 lseek (new, | |
629 load_scnptr + LDHDRSZ + LDSYMSZ*ldhdr.l_nsyms + LDRELSZ*i, | |
25564
d0383ec2061e
New version incorporating Michael Sperber's changes from XEmacs.
Dave Love <fx@gnu.org>
parents:
19924
diff
changeset
|
630 SEEK_SET); |
560 | 631 |
25564
d0383ec2061e
New version incorporating Michael Sperber's changes from XEmacs.
Dave Love <fx@gnu.org>
parents:
19924
diff
changeset
|
632 if (write (new, &ldrel, LDRELSZ) != LDRELSZ) |
560 | 633 { |
634 PERROR (new_name); | |
635 } | |
636 } | |
637 | |
25564
d0383ec2061e
New version incorporating Michael Sperber's changes from XEmacs.
Dave Love <fx@gnu.org>
parents:
19924
diff
changeset
|
638 if (ldrel.l_rsecnm == f_ohdr.o_sndata) |
560 | 639 { |
640 int orig_int; | |
641 | |
14782
8988aa71854e
Handle both AIX 3.2 and 4.1 bind output.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
642 lseek (a_out, |
25564
d0383ec2061e
New version incorporating Michael Sperber's changes from XEmacs.
Dave Love <fx@gnu.org>
parents:
19924
diff
changeset
|
643 orig_data_scnptr + (ldrel.l_vaddr - f_ohdr.data_start), |
d0383ec2061e
New version incorporating Michael Sperber's changes from XEmacs.
Dave Love <fx@gnu.org>
parents:
19924
diff
changeset
|
644 SEEK_SET); |
560 | 645 |
25564
d0383ec2061e
New version incorporating Michael Sperber's changes from XEmacs.
Dave Love <fx@gnu.org>
parents:
19924
diff
changeset
|
646 if (read (a_out, (void *) &orig_int, sizeof (orig_int)) |
d0383ec2061e
New version incorporating Michael Sperber's changes from XEmacs.
Dave Love <fx@gnu.org>
parents:
19924
diff
changeset
|
647 != sizeof (orig_int)) |
560 | 648 { |
649 PERROR (a_name); | |
650 } | |
651 | |
25564
d0383ec2061e
New version incorporating Michael Sperber's changes from XEmacs.
Dave Love <fx@gnu.org>
parents:
19924
diff
changeset
|
652 p = (int *) (ldrel.l_vaddr + d_reloc); |
14782
8988aa71854e
Handle both AIX 3.2 and 4.1 bind output.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
653 |
25564
d0383ec2061e
New version incorporating Michael Sperber's changes from XEmacs.
Dave Love <fx@gnu.org>
parents:
19924
diff
changeset
|
654 switch (ldrel.l_symndx) { |
560 | 655 case SYMNDX_TEXT: |
14782
8988aa71854e
Handle both AIX 3.2 and 4.1 bind output.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
656 orig_int = * p - t_reloc; |
560 | 657 break; |
658 | |
659 case SYMNDX_DATA: | |
660 case SYMNDX_BSS: | |
14782
8988aa71854e
Handle both AIX 3.2 and 4.1 bind output.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
661 orig_int = * p - d_reloc; |
560 | 662 break; |
663 } | |
664 | |
14782
8988aa71854e
Handle both AIX 3.2 and 4.1 bind output.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
665 if (orig_int != * p) |
8988aa71854e
Handle both AIX 3.2 and 4.1 bind output.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
666 { |
8988aa71854e
Handle both AIX 3.2 and 4.1 bind output.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
667 lseek (new, |
25564
d0383ec2061e
New version incorporating Michael Sperber's changes from XEmacs.
Dave Love <fx@gnu.org>
parents:
19924
diff
changeset
|
668 data_scnptr + (ldrel.l_vaddr - f_ohdr.data_start), |
d0383ec2061e
New version incorporating Michael Sperber's changes from XEmacs.
Dave Love <fx@gnu.org>
parents:
19924
diff
changeset
|
669 SEEK_SET); |
14782
8988aa71854e
Handle both AIX 3.2 and 4.1 bind output.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
670 if (write (new, (void *) &orig_int, sizeof (orig_int)) |
8988aa71854e
Handle both AIX 3.2 and 4.1 bind output.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
671 != sizeof (orig_int)) |
8988aa71854e
Handle both AIX 3.2 and 4.1 bind output.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
672 { |
8988aa71854e
Handle both AIX 3.2 and 4.1 bind output.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
673 PERROR (new_name); |
8988aa71854e
Handle both AIX 3.2 and 4.1 bind output.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
674 } |
8988aa71854e
Handle both AIX 3.2 and 4.1 bind output.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
675 } |
560 | 676 } |
677 } | |
25564
d0383ec2061e
New version incorporating Michael Sperber's changes from XEmacs.
Dave Love <fx@gnu.org>
parents:
19924
diff
changeset
|
678 return 0; |
110 | 679 } |
52401 | 680 |
681 /* arch-tag: 0783857a-7c2d-456f-a426-58b722d69fd0 | |
682 (do not change this comment) */ |