diff options
author | Sergey Poznyakoff <gray@gnu.org.ua> | 2012-03-25 18:02:18 +0300 |
---|---|---|
committer | Sergey Poznyakoff <gray@gnu.org.ua> | 2012-03-25 18:02:18 +0300 |
commit | 177423b53793e3ad5dc6fd787f75b3ff4038aedf (patch) | |
tree | 3371b7fb1f2311412b0c8f1b76066e58a163559f /mu/shell.c | |
parent | bf4c4a43ac942d8d81d0d276fe15ae3217f0e5a9 (diff) | |
download | mailutils-177423b53793e3ad5dc6fd787f75b3ff4038aedf.tar.gz mailutils-177423b53793e3ad5dc6fd787f75b3ff4038aedf.tar.bz2 |
Revise some memory allocation routines.
* examples/aclck.c: Check return values from strdup.
* libmailutils/base/usremail.c: Likewise.
* libmailutils/mailbox/bodystruct.c: Likewise.
* lib/mailcap.c: Likewise.
* libmailutils/mailbox/mbx_default.c: Likewise.
* libmailutils/server/acl.c: Likewise.
* libmailutils/stream/logstream.c: Likewise.
* libmailutils/stream/message_stream.c: Likewise.
* libmu_argp/mu_argp.c: Likewise.
* libmu_auth/ldap.c: Likewise.
* libmu_auth/pam.c: Likewise.
* libmu_auth/sql.c: Likewise.
* libmu_sieve/comparator.c: Likewise.
* libmu_sieve/conf.c: Likewise.
* libmu_sieve/extensions/list.c: Likewise.
* libmu_sieve/extensions/vacation.c: Likewise.
* libproto/mailer/prog.c: Likewise.
* libproto/mailer/smtp_io.c: Likewise.
* maidag/lmtp.c: Likewise.
* python/libmu_py/address.c: Likewise.
* sql/odbc.c
* examples/sfrom.c (main): Avoid unnecessary memory allocation.
* libmailutils/mailbox/mailbox.c: Likewise.
* frm/frm.h: Include mailutils/alloc.h, remove xalloc.h
* mh/mh.h: Likewise.
* imap4d/imap4d.h: Remove xalloc.h
* mail/mail.h: Likewise.
* mimeview/mimeview.h: Likewise.
* mu/acl.c: Likewise.
* readmsg/readmsg.c: Likewise.
* include/mailutils/locker.h (mu_locker_set_default_external_program):
Change returned type.
* include/mailutils/mailbox.h (mu_set_folder_directory): Change
returned type.
* libmailutils/base/locker.c (mu_locker_set_default_external_program):
Return int (error code).
* libmailutils/base/tilde.c: Add extra checks
* libmailutils/mime/mimehdr.c (_mime_header_parse): Bugfix.
* mail/folders.c: Don't use alloca, use mu_alloc instead. It
was the only use of that function in Mailutils, so this change
allows to withdraw the alloca module.
* gnulib.modules (alloca, malloc)
(realloc, xalloc): Remove.
* frm/common.c: Use mu_alloc and friends instead of xmalloc.
* frm/from.c: Likewise.
* imap4d/append.c: Likewise.
* imap4d/auth_gsasl.c: Likewise.
* imap4d/authenticate.c: Likewise.
* imap4d/fetch.c: Likewise.
* imap4d/imap4d.c: Likewise.
* imap4d/io.c: Likewise.
* imap4d/list.c: Likewise.
* imap4d/namespace.c: Likewise.
* imap4d/parsebuf.c: Likewise.
* imap4d/preauth.c: Likewise.
* imap4d/rename.c: Likewise.
* imap4d/search.c: Likewise.
* imap4d/util.c: Likewise.
* libmu_argp/muinit.c: Likewise.
* mail/alias.c: Likewise.
* mail/alt.c: Likewise.
* mail/copy.c: Likewise.
* mail/decode.c: Likewise.
* mail/escape.c: Likewise.
* mail/file.c: Likewise.
* mail/from.c: Likewise.
* mail/mail.c: Likewise.
* mail/mailline.c: Likewise
* mail/mailvar.c: Likewise
* mail/msgset.y: Likewise
* mail/page.c: Likewise
* mail/send.c: Likewise
* mail/shell.c: Likewise
* mail/unset.c: Likewise
* mail/util.c: Likewise
* mh/folder.c: Likewise
* mh/mh_alias.l: Likewise
* mh/mh_alias.y: Likewise
* mh/mh_fmtgram.y: Likewise
* mh/mh_format.c: Likewise
* mh/mh_global.c: Likewise
* mh/mh_init.c: Likewise
* mh/mh_list.c: Likewise
* mh/mh_whatnow.c: Likewise
* mh/mh_whom.c: Likewise
* mh/mhn.c: Likewise
* mh/pick.y: Likewise
* mh/prompter-rl.c: Likewise
* mh/refile.c: Likewise
* mh/repl.c: Likewise
* mh/send.c: Likewise
* mh/sortm.c: Likewise
* mimeview/mimetypes.y: Likewise
* mu/dbm.c: Likewise
* mu/dispatch.c: Likewise
* mu/imap.c: Likewise
* mu/pop.c: Likewise
* mu/shell.c: Likewise
* pop3d/apop.c: Likewise
* pop3d/bulletin.c: Likewise
* pop3d/popauth.c: Likewise
* pop3d/user.c: Likewise
Diffstat (limited to 'mu/shell.c')
-rw-r--r-- | mu/shell.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/mu/shell.c b/mu/shell.c index bfc4ad042..358d2ac15 100644 --- a/mu/shell.c +++ b/mu/shell.c @@ -25,7 +25,6 @@ #include "mailutils/libargp.h" #include "muaux.h" #include "mu.h" -#include "xalloc.h" #ifdef WITH_READLINE # include <readline/readline.h> @@ -257,7 +256,7 @@ shell_prompt (int argc, char **argv) free (mutool_shell_prompt); size = strlen (argv[1]); - mutool_shell_prompt = xmalloc (size + 1); + mutool_shell_prompt = mu_alloc (size + 1); mu_wordsplit_c_unquote_copy (mutool_shell_prompt, argv[1], size); return 0; } @@ -292,8 +291,8 @@ get_history_file_name () { char *hname; - hname = xmalloc(sizeof HISTFILE_PREFIX + strlen (rl_readline_name) + - sizeof HISTFILE_SUFFIX - 1); + hname = mu_alloc (sizeof HISTFILE_PREFIX + strlen (rl_readline_name) + + sizeof HISTFILE_SUFFIX - 1); strcpy (hname, "~/.mu_"); strcat (hname, rl_readline_name); strcat (hname, HISTFILE_SUFFIX); @@ -397,7 +396,7 @@ shell_command_generator (const char *text, int state) { cmd++; if (strncmp (name, text, len) == 0) - return xstrdup (name); + return mu_strdup (name); } /* If no names matched, then return NULL. */ @@ -653,8 +652,8 @@ mutool_shell (const char *name, struct mutool_command *cmd) ; user_command_count = n; - shell_comtab = xcalloc (n + MU_ARRAY_SIZE (default_comtab), - sizeof (shell_comtab[0])); + shell_comtab = mu_calloc (n + MU_ARRAY_SIZE (default_comtab), + sizeof (shell_comtab[0])); memcpy (shell_comtab, cmd, n * sizeof (shell_comtab[0])); memcpy (shell_comtab + n, default_comtab, sizeof (default_comtab)); |