[SCM] GNU Mailutils branch, master, updated. release-2.2-174-gb02eb9b

[Sergey Poznyakoff]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Mailutils".

http://git.savannah.gnu.org/cgit/mailutils.git/commit/?id=b02eb9b062494d2ed77ca1f52cd7733486df0bef

The branch, master has been updated
       via  b02eb9b062494d2ed77ca1f52cd7733486df0bef (commit)
       via  89bdc37336218836a6c208e37696e6e723c42894 (commit)
       via  150ebcfaf5ded43ff71313ce2acff79bf99c1487 (commit)
      from  1d5c1ef0d22380eafe6ee78991e0c60315a33222 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit b02eb9b062494d2ed77ca1f52cd7733486df0bef
Author: Sergey Poznyakoff <address@hidden>
Date:   Tue Nov 2 15:04:55 2010 +0200

    Remove the --license option.
    
    It is not needed because the --version option shows a terse info about the
    license, as well as a link to its full text.

commit 89bdc37336218836a6c208e37696e6e723c42894
Author: Sergey Poznyakoff <address@hidden>
Date:   Tue Nov 2 14:47:42 2010 +0200

    Minor change.
    
    * po/POTFILES.in: Fix erroneous filenames.

commit 150ebcfaf5ded43ff71313ce2acff79bf99c1487
Author: Sergey Poznyakoff <address@hidden>
Date:   Tue Nov 2 14:47:01 2010 +0200

    Use full buffering for streamrefs.
    
    * libmailutils/stream/streamref.c (mu_streamref_create_abridged): Set
    full buffering by default.

-----------------------------------------------------------------------

Summary of changes:
 comsat/comsat.c                 |    1 -
 dotlock/dotlock.c               |    1 -
 examples/muauth.c               |    1 -
 frm/frm.c                       |    1 -
 frm/from.c                      |    1 -
 guimb/main.c                    |    1 -
 imap4d/imap4d.c                 |    1 -
 include/mailutils/libargp.h     |    1 -
 include/mailutils/version.h     |    1 -
 libmailutils/base/version.c     |   17 ---------------
 libmailutils/cfg/gocs.c         |    1 -
 libmailutils/stream/streamref.c |    5 +++-
 libmu_argp/cmdline.c            |    1 -
 libmu_argp/common.c             |   43 ---------------------------------------
 libmu_cfg/init.c                |    2 +-
 maidag/maidag.c                 |    1 -
 mail/mail.c                     |    1 -
 messages/messages.c             |    1 -
 mimeview/mimeview.c             |    1 -
 movemail/movemail.c             |    1 -
 mu/mu.c                         |    1 -
 po/POTFILES.in                  |    5 ++-
 pop3d/pop3d.c                   |    1 -
 pop3d/popauth.c                 |    1 -
 sieve/sieve.c                   |    1 -
 25 files changed, 8 insertions(+), 84 deletions(-)

diff --git a/comsat/comsat.c b/comsat/comsat.c
index 373998f..8f82f1a 100644
--- a/comsat/comsat.c
+++ b/comsat/comsat.c
@@ -87,7 +87,6 @@ static const char *comsat_argp_capa[] = {
   "logging",
   "mailbox",
   "locking",
-  "license",
   NULL
 };
 
diff --git a/dotlock/dotlock.c b/dotlock/dotlock.c
index 84d322e..6afeec0 100644
--- a/dotlock/dotlock.c
+++ b/dotlock/dotlock.c
@@ -134,7 +134,6 @@ struct mu_cfg_param dotlock_cfg_param[] = {
 
 
 const char *dotlock_capa[] = {
-  "license",
   "common",
   "debug",
   NULL
diff --git a/examples/muauth.c b/examples/muauth.c
index a80cda8..3008b30 100644
--- a/examples/muauth.c
+++ b/examples/muauth.c
@@ -31,7 +31,6 @@ static char args_doc[] = "key";
 
 static const char *capa[] = {
   "auth",
-  "license",
   "common",
   "debug",
   NULL
diff --git a/frm/frm.c b/frm/frm.c
index fdd43c1..c0348e0 100644
--- a/frm/frm.c
+++ b/frm/frm.c
@@ -203,7 +203,6 @@ static struct argp argp = {
 static const char *frm_argp_capa[] = {
   "common",
   "debug",
-  "license",
   "mailbox",
   "locking",
   NULL
diff --git a/frm/from.c b/frm/from.c
index d86cfea..e621a23 100644
--- a/frm/from.c
+++ b/frm/from.c
@@ -70,7 +70,6 @@ static struct argp argp = {
 static const char *capa[] = {
   "common",
   "debug",
-  "license",
   "mailbox",
   "locking",
   NULL
diff --git a/guimb/main.c b/guimb/main.c
index 4a3f39e..a6cfbb1 100644
--- a/guimb/main.c
+++ b/guimb/main.c
@@ -139,7 +139,6 @@ static const char *guimb_argp_capa[] = {
   "debug",
   "mailbox",
   "locking",
-  "license",
   NULL
 };
 
diff --git a/imap4d/imap4d.c b/imap4d/imap4d.c
index 844b953..848b4d7 100644
--- a/imap4d/imap4d.c
+++ b/imap4d/imap4d.c
@@ -90,7 +90,6 @@ static const char *imap4d_capa[] = {
   "mailbox",
   "locking",
   "logging",
-  "license",
   NULL
 };
 
diff --git a/include/mailutils/libargp.h b/include/mailutils/libargp.h
index 586d74a..603b859 100644
--- a/include/mailutils/libargp.h
+++ b/include/mailutils/libargp.h
@@ -47,7 +47,6 @@ extern int (*mu_app_cfg_verifier) (void);
   
 extern struct mu_cmdline_capa mu_common_cmdline;
 extern struct mu_cmdline_capa mu_logging_cmdline;
-extern struct mu_cmdline_capa mu_license_cmdline;
 extern struct mu_cmdline_capa mu_mailbox_cmdline;
 extern struct mu_cmdline_capa mu_locking_cmdline;
 extern struct mu_cmdline_capa mu_address_cmdline;
diff --git a/include/mailutils/version.h b/include/mailutils/version.h
index 566d735..d93ff75 100644
--- a/include/mailutils/version.h
+++ b/include/mailutils/version.h
@@ -30,7 +30,6 @@ struct mu_conf_option
   char *descr;
 };
   
-extern char *mu_license_text;
 extern void mu_print_options (void);
 extern void mu_fprint_options (FILE *fp, int verbose);
 extern void mu_fprint_conf_option (FILE *fp, const struct mu_conf_option *opt,
diff --git a/libmailutils/base/version.c b/libmailutils/base/version.c
index d482140..2cf11ac 100644
--- a/libmailutils/base/version.c
+++ b/libmailutils/base/version.c
@@ -27,23 +27,6 @@
 
 #include <confpaths.h>
 
-char *mu_license_text =
- N_("   GNU Mailutils is free software; you can redistribute it and/or 
modify\n"
-    "   it under the terms of the GNU General Public License as published by\n"
-    "   the Free Software Foundation; either version 3 of the License, or\n"
-    "   (at your option) any later version.\n"
-    "\n"
-    "   GNU Mailutils is distributed in the hope that it will be useful,\n"
-    "   but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
-    "   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
-    "   GNU General Public License for more details.\n"
-    "\n"
-    "   You should have received a copy of the GNU General Public License 
along\n"
-    "   with GNU Mailutils.  If not, see <http://www.gnu.org/licenses/>.\n"
-    "\n"
-    "\n"
-);
-
 static struct mu_conf_option mu_conf_option[] = {
   { "VERSION=" VERSION, N_("Version of this package") },
   { "SYSCONFDIR=" SYSCONFDIR, N_("System configuration directory") },
diff --git a/libmailutils/cfg/gocs.c b/libmailutils/cfg/gocs.c
index 7976aa2..d50d3f7 100644
--- a/libmailutils/cfg/gocs.c
+++ b/libmailutils/cfg/gocs.c
@@ -299,7 +299,6 @@ find_init_function (struct mu_gocs_entry *tab, const char 
*capa)
 
 static struct mu_gocs_entry std_gocs_table[] = {
   { "common", mu_gocs_dummy },
-  { "license", mu_gocs_dummy },
   { "mailbox", mu_gocs_mailbox_init },
   { "locking", mu_gocs_locking_init },
   { "address", mu_gocs_source_email_init },
diff --git a/libmailutils/stream/streamref.c b/libmailutils/stream/streamref.c
index e860a55..2faff48 100644
--- a/libmailutils/stream/streamref.c
+++ b/libmailutils/stream/streamref.c
@@ -266,7 +266,7 @@ mu_streamref_create_abridged (mu_stream_t *pref, 
mu_stream_t str,
   mu_off_t off;
   int flags;
   struct _mu_streamref *sp;
-
+  
   rc = mu_stream_seek (str, 0, MU_SEEK_SET, &off);
   if (rc)
     return rc;
@@ -302,6 +302,9 @@ mu_streamref_create_abridged (mu_stream_t *pref, 
mu_stream_t str,
     off = start;
   sp->offset = off;
   *pref = (mu_stream_t) sp;
+
+  mu_stream_set_buffer (*pref, mu_buffer_full, 0);
+
   return 0;
 }
 
diff --git a/libmu_argp/cmdline.c b/libmu_argp/cmdline.c
index 26f84fa..13994bf 100644
--- a/libmu_argp/cmdline.c
+++ b/libmu_argp/cmdline.c
@@ -24,7 +24,6 @@
 static struct mu_cmdline_capa *all_cmdline_capa[] = {
   &mu_common_cmdline,
   &mu_logging_cmdline,
-  &mu_license_cmdline,
   &mu_mailer_cmdline,
   &mu_debug_cmdline,
   &mu_tls_cmdline,
diff --git a/libmu_argp/common.c b/libmu_argp/common.c
index a76e378..cfc6b1f 100644
--- a/libmu_argp/common.c
+++ b/libmu_argp/common.c
@@ -197,49 +197,6 @@ struct mu_cmdline_capa mu_logging_cmdline = {
 
 
 /* ************************************************************************* */
-/* License                                                                   */
-/* ************************************************************************* */
-
-/* Option to print the license. */
-static struct argp_option mu_license_argp_option[] = {
-  { "license", OPT_LICENSE, NULL, 0, N_("print license and exit"), -2 },
-  { NULL,      0, NULL, 0, NULL, 0 }
-};
-
-static error_t
-mu_license_argp_parser (int key, char *arg, struct argp_state *state)
-{
-  switch (key)
-    {
-    case OPT_LICENSE:
-      printf (_("License for %s:\n\n"), argp_program_version);
-      printf ("%s", mu_license_text);
-      exit (0);
-
-    default:
-      return ARGP_ERR_UNKNOWN;
-    }
-  return 0;
-}
-
-struct argp mu_license_argp = {
-  mu_license_argp_option,
-  mu_license_argp_parser,
-};
-
-struct argp_child mu_license_argp_child = {
-  &mu_license_argp,
-  0,
-  NULL,
-  0
-};
-
-struct mu_cmdline_capa mu_license_cmdline = {
-  "license", &mu_license_argp_child 
-};
-
-
-/* ************************************************************************* */
 /* Mailer                                                                    */
 /* ************************************************************************* */
 
diff --git a/libmu_cfg/init.c b/libmu_cfg/init.c
index 1dcaa77..176465c 100644
--- a/libmu_cfg/init.c
+++ b/libmu_cfg/init.c
@@ -57,7 +57,7 @@ find_cfg_capa (const char *name)
 static int
 reserved_name (const char *name)
 {
-  static char *reserved[] = { "common", "license", NULL };
+  static char *reserved[] = { "common", NULL };
   char **p;
   for (p = reserved; *p; p++)
     if (strcmp (name, *p) == 0)
diff --git a/maidag/maidag.c b/maidag/maidag.c
index b588ca9..0b54e6c 100644
--- a/maidag/maidag.c
+++ b/maidag/maidag.c
@@ -131,7 +131,6 @@ static const char *maidag_argp_capa[] = {
   "auth",
   "common",
   "debug",
-  "license",
   "logging",
   "mailbox",
   "locking",
diff --git a/mail/mail.c b/mail/mail.c
index 3f70e66..acf265c 100644
--- a/mail/mail.c
+++ b/mail/mail.c
@@ -203,7 +203,6 @@ static struct argp argp = {
 static const char *mail_capa[] = {
   "common",
   "debug",
-  "license",
   "mailbox",
   "locking",
   NULL 
diff --git a/messages/messages.c b/messages/messages.c
index e467a9b..6fc5d4b 100644
--- a/messages/messages.c
+++ b/messages/messages.c
@@ -44,7 +44,6 @@ static struct argp_option options[] = {
 static const char *argp_capa[] = {
   "common",
   "debug",
-  "license",
   "mailbox",
   "locking",
   NULL
diff --git a/mimeview/mimeview.c b/mimeview/mimeview.c
index 6523853..5d67108 100644
--- a/mimeview/mimeview.c
+++ b/mimeview/mimeview.c
@@ -178,7 +178,6 @@ struct mu_cfg_param mimeview_cfg_param[] = {
 static const char *capa[] = {
   "common",
   "debug",
-  "license",
   NULL
 };
 
diff --git a/movemail/movemail.c b/movemail/movemail.c
index b8da17f..1acef61 100644
--- a/movemail/movemail.c
+++ b/movemail/movemail.c
@@ -330,7 +330,6 @@ struct mu_cfg_param movemail_cfg_param[] = {
 static const char *movemail_capa[] = {
   "common",
   "debug",
-  "license",
   "locking",
   "mailbox",
   "auth",
diff --git a/mu/mu.c b/mu/mu.c
index a0900f7..8649efe 100644
--- a/mu/mu.c
+++ b/mu/mu.c
@@ -73,7 +73,6 @@ static struct argp argp = {
 static const char *mu_tool_capa[] = {
   "common",
   "debug",
-  "license",
   "locking",
   "mailbox",
   "auth",
diff --git a/po/POTFILES.in b/po/POTFILES.in
index c23e197..b2d2a5b 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -142,8 +142,9 @@ libmailutils/server/msrv.c
 libmailutils/mailbox/message.c
 libmailutils/mailbox/mbx_default.c
 libmailutils/mailer/mailer.c
-libmailutils/mailer/smtp.c
-libmailutils/mailer/smtp_gsasl.c
+
+libproto/mailer/smtp.c
+libproto/mailer/smtp_gsasl.c
 
 libmailutils/auth/mu_auth.c
 
diff --git a/pop3d/pop3d.c b/pop3d/pop3d.c
index b058147..a497996 100644
--- a/pop3d/pop3d.c
+++ b/pop3d/pop3d.c
@@ -139,7 +139,6 @@ static const char *pop3d_argp_capa[] = {
   "mailbox",
   "locking",
   "logging",
-  "license",
   NULL
 };
 
diff --git a/pop3d/popauth.c b/pop3d/popauth.c
index 2c9d75e..4bd172b 100644
--- a/pop3d/popauth.c
+++ b/pop3d/popauth.c
@@ -98,7 +98,6 @@ static struct argp argp = {
 
 static const char *popauth_argp_capa[] = {
   "common",
-  "license",
   NULL
 };
 
diff --git a/sieve/sieve.c b/sieve/sieve.c
index e021a33..0a4ec61 100644
--- a/sieve/sieve.c
+++ b/sieve/sieve.c
@@ -307,7 +307,6 @@ static const char *sieve_argp_capa[] =
   "debug",
   "mailbox",
   "locking",
-  "license",
   "logging",
   "mailer",
   NULL


hooks/post-receive
-- 
GNU Mailutils