Imported Upstream version 2.6.0

[debian/amanda] / common-src / amfeatures.c

diff --git a/common-src/amfeatures.c b/common-src/amfeatures.c
index 63dcea385df4426022b27b5dee7a425205db8dae..675a647eba48691b24f243c874f9271ff8fb9f02 100644 (file)
--- a/common-src/amfeatures.c
+++ b/common-src/amfeatures.c
@@ -25,13 +25,13 @@
  */
 
 /*
- * $Id: amfeatures.c,v 1.1.2.9.2.3 2004/08/11 19:16:28 martinea Exp $
+ * $Id: amfeatures.c,v 1.24 2006/07/19 17:46:07 martinea Exp $
  *
  * Feature test related code.
  */
 
-#include <amanda.h>
-#include <amfeatures.h>
+#include "amanda.h"
+#include "amfeatures.h"
 
 /*
  *=====================================================================
@@ -45,9 +45,9 @@
  */
 
 am_feature_t *
-am_init_feature_set()
+am_init_feature_set(void)
 {
-    am_feature_t               *f = NULL;
+    am_feature_t               *f;
 
     if ((f = am_allocate_feature_set()) != NULL) {
        /*
@@ -72,6 +72,7 @@ am_init_feature_set()
 
        am_add_feature(f, fe_program_dump);
        am_add_feature(f, fe_program_gnutar);
+       am_add_feature(f, fe_program_backup_api);
 
        am_add_feature(f, fe_options_compress_fast);
        am_add_feature(f, fe_options_compress_best);
@@ -109,9 +110,43 @@ am_init_feature_set()
        am_add_feature(f, fe_amidxtaped_nargs);
        am_add_feature(f, fe_amidxtaped_config);
 
+       am_add_feature(f, fe_recover_splits);
+       am_add_feature(f, fe_amidxtaped_exchange_features);
        am_add_feature(f, fe_partial_estimate);
        am_add_feature(f, fe_calcsize_estimate);
        am_add_feature(f, fe_selfcheck_calcsize);
+       am_add_feature(f, fe_options_compress_cust);
+       am_add_feature(f, fe_options_srvcomp_cust);
+       am_add_feature(f, fe_options_encrypt_cust);
+       am_add_feature(f, fe_options_encrypt_serv_cust);
+       am_add_feature(f, fe_options_client_decrypt_option);
+       am_add_feature(f, fe_options_server_decrypt_option);
+
+       am_add_feature(f, fe_amindexd_marshall_in_OLSD);
+       am_add_feature(f, fe_amindexd_marshall_in_ORLD);
+       am_add_feature(f, fe_amindexd_marshall_in_DHST);
+
+        am_add_feature(f, fe_amrecover_FEEDME);
+        am_add_feature(f, fe_amrecover_timestamp);
+
+        am_add_feature(f, fe_interface_quoted_text);
+
+       am_add_feature(f, fe_program_star);
+
+       am_add_feature(f, fe_amindexd_options_hostname);
+       am_add_feature(f, fe_amindexd_options_features);
+       am_add_feature(f, fe_amindexd_options_auth);
+
+       am_add_feature(f, fe_amidxtaped_options_hostname);
+       am_add_feature(f, fe_amidxtaped_options_features);
+       am_add_feature(f, fe_amidxtaped_options_auth);
+
+       am_add_feature(f, fe_amrecover_message);
+       am_add_feature(f, fe_amrecover_feedme_tape);
+
+       am_add_feature(f, fe_req_options_config);
+
+       am_add_feature(f, fe_rep_sendsize_quoted_error);
     }
     return f;
 }
@@ -176,13 +211,13 @@ am_set_default_feature_set(void)
  */
 
 am_feature_t *
-am_allocate_feature_set()
+am_allocate_feature_set(void)
 {
     size_t                     nbytes;
     am_feature_t               *result;
 
-    result = (am_feature_t *)alloc(sizeof(*result));
-    memset(result, 0, sizeof(*result));
+    result = (am_feature_t *)alloc(SIZEOF(*result));
+    memset(result, 0, SIZEOF(*result));
     nbytes = (((size_t)last_feature) + 8) >> 3;
     result->size = nbytes;
     result->bytes = (unsigned char *)alloc(nbytes);
@@ -202,8 +237,8 @@ am_allocate_feature_set()
  */
 
 void
-am_release_feature_set(f)
-    am_feature_t               *f;
+am_release_feature_set(
+    am_feature_t       *f)
 {
     if (f != NULL) {
        amfree(f->bytes);
@@ -226,9 +261,9 @@ am_release_feature_set(f)
  */
 
 int
-am_add_feature(f, n)
-    am_feature_t               *f;
-    am_feature_e               n;
+am_add_feature(
+    am_feature_t       *f,
+    am_feature_e       n)
 {
     size_t                     byte;
     int                                bit;
@@ -238,7 +273,7 @@ am_add_feature(f, n)
        byte = ((size_t)n) >> 3;
        if (byte < f->size) {
            bit = ((int)n) & 0x7;
-           f->bytes[byte] |= (1 << bit);
+           f->bytes[byte] = (unsigned char)((int)f->bytes[byte] | (unsigned char)(1 << bit));
            result = 1;
        }
     }
@@ -259,9 +294,9 @@ am_add_feature(f, n)
  */
 
 int
-am_remove_feature(f, n)
-    am_feature_t               *f;
-    am_feature_e               n;
+am_remove_feature(
+    am_feature_t       *f,
+    am_feature_e       n)
 {
     size_t                     byte;
     int                                bit;
@@ -271,7 +306,7 @@ am_remove_feature(f, n)
        byte = ((size_t)n) >> 3;
        if (byte < f->size) {
            bit = ((int)n) & 0x7;
-           f->bytes[byte] &= ~(1 << bit);
+           f->bytes[byte] = (unsigned char)((int)f->bytes[byte] & (unsigned char)~(1 << bit));
            result = 1;
        }
     }
@@ -291,9 +326,9 @@ am_remove_feature(f, n)
  */
 
 int
-am_has_feature(f, n)
-    am_feature_t               *f;
-    am_feature_e               n;
+am_has_feature(
+    am_feature_t       *f,
+    am_feature_e       n)
 {
     size_t                     byte;
     int                                bit;
@@ -321,18 +356,18 @@ am_has_feature(f, n)
  */
 
 char *
-am_feature_to_string(f)
-    am_feature_t               *f;
+am_feature_to_string(
+    am_feature_t       *f)
 {
     char                       *result;
     size_t                     i;
 
     if (f == NULL) {
-       result = stralloc("UNKNOWNFEATURE");
+       result = stralloc(_("UNKNOWNFEATURE"));
     } else {
        result = alloc((f->size * 2) + 1);
        for (i = 0; i < f->size; i++) {
-           ap_snprintf(result + (i * 2), 2 + 1, "%02x", f->bytes[i]);
+           g_snprintf(result + (i * 2), 2 + 1, "%02x", f->bytes[i]);
        }
        result[i * 2] = '\0';
     }
@@ -360,8 +395,8 @@ am_feature_to_string(f)
  */
 
 am_feature_t *
-am_string_to_feature(s)
-    char                       *s;
+am_string_to_feature(
+    char               *s)
 {
     am_feature_t               *f = NULL;
     size_t                     i;
@@ -394,7 +429,7 @@ am_string_to_feature(s)
                amfree(f);                              /* bad conversion */
                break;
            }
-           f->bytes[i] = (ch1 << 4) | ch2;
+           f->bytes[i] = (unsigned char)((ch1 << 4) | ch2);
        }
     }
     return f;
@@ -402,9 +437,9 @@ am_string_to_feature(s)
 
 #if defined(TEST)
 int
-main(argc, argv)
-    int                                argc;
-    char                       **argv;
+main(
+    int                argc,
+    char **    argv)
 {
     am_feature_t               *f;
     am_feature_t               *f1;
@@ -413,20 +448,29 @@ main(argc, argv)
     int                                i;
     int                                n;
 
+    /*
+     * Configure program for internationalization:
+     *   1) Only set the message locale for now.
+     *   2) Set textdomain for all amanda related programs to "amanda"
+     *      We don't want to be forced to support dozens of message catalogs.
+     */  
+    setlocale(LC_MESSAGES, "C");
+    textdomain("amanda"); 
+
     f = am_init_feature_set();
     if (f == NULL) {
-       fprintf(stderr, "cannot initialize feature set\n");
+       g_fprintf(stderr, _("cannot initialize feature set\n"));
        return 1;
     }
 
     s = am_feature_to_string(f);
-    printf("base features=%s\n", s);
+    g_printf(_("base features=%s\n"), s);
 
     f1 = am_string_to_feature(s);
     s1 = am_feature_to_string(f1);
     if (strcmp(s, s1) != 0) {
-       fprintf(stderr, "base feature -> string -> feature set mismatch\n");
-       fprintf(stderr, "conv features=%s\n", s);
+       g_fprintf(stderr, _("base feature -> string -> feature set mismatch\n"));
+       g_fprintf(stderr, _("conv features=%s\n"), s);
     }
 
     amfree(s1);
@@ -436,29 +480,29 @@ main(argc, argv)
        if (argv[i][0] == '+') {
            n = atoi(&argv[i][1]);
            if (am_add_feature(f, (am_feature_e)n)) {
-               printf("added feature number %d\n", n);
+               g_printf(_("added feature number %d\n"), n);
            } else {
-               printf("could not add feature number %d\n", n);
+               g_printf(_("could not add feature number %d\n"), n);
            }
        } else if (argv[i][0] == '-') {
            n = atoi(&argv[i][1]);
            if (am_remove_feature(f, (am_feature_e)n)) {
-               printf("removed feature number %d\n", n);
+               g_printf(_("removed feature number %d\n"), n);
            } else {
-               printf("could not remove feature number %d\n", n);
+               g_printf(_("could not remove feature number %d\n"), n);
            }
        } else {
            n = atoi(argv[i]);
            if (am_has_feature(f, (am_feature_e)n)) {
-               printf("feature %d is set\n", n);
+               g_printf(_("feature %d is set\n"), n);
            } else {
-               printf("feature %d is not set\n", n);
+               g_printf(_("feature %d is not set\n"), n);
            }
        }
     }
 
     s = am_feature_to_string(f);
-    printf(" new features=%s\n", s);
+    g_printf(_(" new features=%s\n"), s);
     amfree(s);
 
     return 0;