48/20a3cba2984389a643898a3494a30223672a6a

   1 Return-Path: <jani@nikula.org>\r
   2 X-Original-To: notmuch@notmuchmail.org\r
   3 Delivered-To: notmuch@notmuchmail.org\r
   4 Received: from localhost (localhost [127.0.0.1])\r
   5         by olra.theworths.org (Postfix) with ESMTP id 7CACE431FC7\r
   6         for <notmuch@notmuchmail.org>; Sun,  3 Mar 2013 13:55:50 -0800 (PST)\r
   7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
   8 X-Amavis-Alert: BAD HEADER SECTION, Duplicate header field: "References"\r
   9 X-Spam-Flag: NO\r
  10 X-Spam-Score: -0.7\r
  11 X-Spam-Level: \r
  12 X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5\r
  13         tests=[RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled\r
  14 Received: from olra.theworths.org ([127.0.0.1])\r
  15         by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
  16         with ESMTP id CiQXr3mL2ws4 for <notmuch@notmuchmail.org>;\r
  17         Sun,  3 Mar 2013 13:55:50 -0800 (PST)\r
  18 Received: from mail-lb0-f181.google.com (mail-lb0-f181.google.com\r
  19         [209.85.217.181]) (using TLSv1 with cipher RC4-SHA (128/128 bits))\r
  20         (No client certificate requested)\r
  21         by olra.theworths.org (Postfix) with ESMTPS id 9AB42429E33\r
  22         for <notmuch@notmuchmail.org>; Sun,  3 Mar 2013 13:55:32 -0800 (PST)\r
  23 Received: by mail-lb0-f181.google.com with SMTP id gm6so3413461lbb.26\r
  24         for <notmuch@notmuchmail.org>; Sun, 03 Mar 2013 13:55:29 -0800 (PST)\r
  25 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;\r
  26         d=google.com; s=20120113;\r
  27         h=x-received:from:to:cc:subject:date:message-id:x-mailer:in-reply-to\r
  28         :references:in-reply-to:references:x-gm-message-state;\r
  29         bh=gc4zUH5wI6IzenxhDROcBrfY2sMFRXwZtQckaJyV+A0=;\r
  30         b=E35GF0Tx5yFCNHlMfQirowSwnE8KAPdPAWeQ9XuQ8C5o7NDqzQDAlJ2yBWAKCXQFa/\r
  31         h3oP9p3lMEHZkEHptBiuhbfjlDnSQ42mwSe7nuA+5Bv0ua43yIvThYOT/Rl+fM9Dg03g\r
  32         yrmoQQ8JV737DOMtMPArNUIlFwsy79WzSd5GgXRUgJFzHVz9/WqH6ZVLPGQ7xlQzEuga\r
  33         LFsv7bx/7K5JvnSDlUaUHsMBmjD1EF8kvQWl9t9puwZrgxk4x6QGZ5KWQDp9OVZiZNDL\r
  34         DZkxACCrbbVQ4mKGuA5thp8ne65XRQaGmRMBa4xg0xbC57DNYH6rmVcRlurCZET6/9/c\r
  35         d45Q==\r
  36 X-Received: by 10.112.50.169 with SMTP id d9mr3603525lbo.57.1362347729653;\r
  37         Sun, 03 Mar 2013 13:55:29 -0800 (PST)\r
  38 Received: from localhost (dsl-hkibrasgw4-50df51-27.dhcp.inet.fi.\r
  39         [80.223.81.27])\r
  40         by mx.google.com with ESMTPS id pk1sm10735446lab.0.2013.03.03.13.55.28\r
  41         (version=TLSv1.2 cipher=RC4-SHA bits=128/128);\r
  42         Sun, 03 Mar 2013 13:55:28 -0800 (PST)\r
  43 From: Jani Nikula <jani@nikula.org>\r
  44 To: notmuch@notmuchmail.org\r
  45 Subject: [PATCH v2 6/6] cli: add top level --config=FILE option\r
  46 Date: Sun,  3 Mar 2013 23:55:10 +0200\r
  47 Message-Id:\r
  48  <8e1f0e7ba278219d54a3177a50fe84dc8755db6d.1362347362.git.jani@nikula.org>\r
  49 X-Mailer: git-send-email 1.7.10.4\r
  50 In-Reply-To: <cover.1362347362.git.jani@nikula.org>\r
  51 References: <cover.1362347362.git.jani@nikula.org>\r
  52 In-Reply-To: <cover.1362347362.git.jani@nikula.org>\r
  53 References: <cover.1362347362.git.jani@nikula.org>\r
  54 X-Gm-Message-State:\r
  55  ALoCoQm0UJpmj62D6s0JX6lJ+qvRZg6b7gA1FnEW8y+gxbZrzW5ibBebebHOIORSX3wXkzhsy9lf\r
  56 X-BeenThere: notmuch@notmuchmail.org\r
  57 X-Mailman-Version: 2.1.13\r
  58 Precedence: list\r
  59 List-Id: "Use and development of the notmuch mail system."\r
  60         <notmuch.notmuchmail.org>\r
  61 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
  62         <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
  63 List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
  64 List-Post: <mailto:notmuch@notmuchmail.org>\r
  65 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
  66 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
  67         <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
  68 X-List-Received-Date: Sun, 03 Mar 2013 21:55:50 -0000\r
  69 \r
  70 Let the user specify the config file on the command line.\r
  71 ---\r
  72  notmuch.c |    4 +++-\r
  73  1 file changed, 3 insertions(+), 1 deletion(-)\r
  74 \r
  75 diff --git a/notmuch.c b/notmuch.c\r
  76 index 3241e23..f51a84f 100644\r
  77 --- a/notmuch.c\r
  78 +++ b/notmuch.c\r
  79 @@ -258,6 +258,7 @@ main (int argc, char *argv[])\r
  80      char *talloc_report;\r
  81      const char *command_name = NULL;\r
  82      command_t *command;\r
  83 +    char *config_file_name = NULL;\r
  84      notmuch_config_t *config;\r
  85      notmuch_bool_t print_help=FALSE, print_version=FALSE;\r
  86      int opt_index;\r
  87 @@ -266,6 +267,7 @@ main (int argc, char *argv[])\r
  88      notmuch_opt_desc_t options[] = {\r
  89         { NOTMUCH_OPT_BOOLEAN, &print_help, "help", 'h', 0 },\r
  90         { NOTMUCH_OPT_BOOLEAN, &print_version, "version", 'v', 0 },\r
  91 +       { NOTMUCH_OPT_STRING, &config_file_name, "config", 'c', 0 },\r
  92         { 0, 0, 0, 0, 0 }\r
  93      };\r
  94  \r
  95 @@ -303,7 +305,7 @@ main (int argc, char *argv[])\r
  96         return 1;\r
  97      }\r
  98  \r
  99 -    config = notmuch_config_open (local, NULL, command->create_config);\r
 100 +    config = notmuch_config_open (local, config_file_name, command->create_config);\r
 101      if (!config)\r
 102         return 1;\r
 103  \r
 104 -- \r
 105 1.7.10.4\r
 106 \r