[SCM] GNU Mailutils branch, master, updated. release-2.2-523-gc8a26bc

[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=c8a26bc9014fbf2660072fd25faf1fa91c474dff

The branch, master has been updated
       via  c8a26bc9014fbf2660072fd25faf1fa91c474dff (commit)
      from  a4b7febbcb907b96181361824fac23e24485c023 (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 c8a26bc9014fbf2660072fd25faf1fa91c474dff
Author: Sergey Poznyakoff <address@hidden>
Date:   Tue Dec 13 17:05:50 2011 +0200

    Minor changes.
    
    * libmailutils/datetime/streamftime.c (mu_c_streamftime): Handle
    %Z separately.
    * libmu_sieve/sieve.y (mu_sieve_compile): Return MU_ERR_PARSE on
    errors.

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

Summary of changes:
 libmailutils/datetime/streamftime.c |    9 ++++++++-
 libmu_sieve/sieve.y                 |    7 +++----
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/libmailutils/datetime/streamftime.c 
b/libmailutils/datetime/streamftime.c
index 311fe00..873a070 100644
--- a/libmailutils/datetime/streamftime.c
+++ b/libmailutils/datetime/streamftime.c
@@ -368,8 +368,15 @@ mu_c_streamftime (mu_stream_t str, const char *fmt, struct 
tm *input_tm,
          rc = mu_stream_printf (str, "%d", tm.tm_year + 1900);
          break;
          
-       case 'z':
        case 'Z':
+         /* The timezone or name or abbreviation. */
+         if (tz && tz->tz_name)
+           {
+             rc = mu_stream_printf (str, "%s", tz->tz_name);
+             break;
+           }
+         /* fall through */
+       case 'z':
          /* The time-zone as hour offset from GMT, for formatting RFC-822
             dates (e.g. "%a, %d %b %Y %H:%M:%S %z") */
          {
diff --git a/libmu_sieve/sieve.y b/libmu_sieve/sieve.y
index cdb59e2..897a194 100644
--- a/libmu_sieve/sieve.y
+++ b/libmu_sieve/sieve.y
@@ -612,13 +612,12 @@ mu_sieve_compile (mu_sieve_machine_t mach, const char 
*name)
 
   if (mu_sv_lex_begin (name) == 0)
     {
-      rc = yyparse ();
-      if (mu_sieve_error_count)
-       rc = 1;
+      if (yyparse () || mu_sieve_error_count)
+       rc = MU_ERR_PARSE;
       mu_sv_lex_finish ();
     }
   else
-    rc = 1;
+    rc = MU_ERR_FAILURE;
   
   mu_sieve_machine_finish (mach);
   return rc;


hooks/post-receive
-- 
GNU Mailutils