lintian doesn't like orphan packages with uploaders...

[debian/amanda] / server-src / amindexd.c

diff --git a/server-src/amindexd.c b/server-src/amindexd.c
index 2e09bfe3c1b55f1126e9eded3cf33b21b3aa535a..6f2e5179af7ed6cccbe529128f9da1f73a4859ff 100644 (file)
--- a/server-src/amindexd.c
+++ b/server-src/amindexd.c
@@ -1,6 +1,7 @@
 /*
  * Amanda, The Advanced Maryland Automatic Network Disk Archiver
  * Copyright (c) 1991-1998 University of Maryland at College Park
+ * Copyright (c) 2007-2012 Zmanda, Inc.  All Rights Reserved.
  * All Rights Reserved.
  *
  * Permission to use, copy, modify, distribute, and sell this software and its
@@ -282,9 +283,16 @@ uncompress_file(
 
        /* start the sort process */
        putenv(stralloc("LC_ALL=C"));
-       pid_sort = pipespawn(SORT_PATH, STDIN_PIPE|STDERR_PIPE, 0,
-                            &pipe_to_sort, &indexfd, &sort_errfd,
-                            SORT_PATH, NULL);
+       if (getconf_seen(CNF_TMPDIR)) {
+           gchar *tmpdir = getconf_str(CNF_TMPDIR);
+           pid_sort = pipespawn(SORT_PATH, STDIN_PIPE|STDERR_PIPE, 0,
+                                &pipe_to_sort, &indexfd, &sort_errfd,
+                                SORT_PATH, "-T", tmpdir, NULL);
+       } else {
+           pid_sort = pipespawn(SORT_PATH, STDIN_PIPE|STDERR_PIPE, 0,
+                                &pipe_to_sort, &indexfd, &sort_errfd,
+                                SORT_PATH, NULL);
+       }
        aclose(indexfd);
 
        /* start a subprocess */
@@ -1291,6 +1299,11 @@ main(
     char his_hostname[MAX_HOSTNAME_LENGTH];
     char *cfg_opt = NULL;
 
+    if (argc > 1 && argv && argv[1] && g_str_equal(argv[1], "--version")) {
+       printf("amindexd-%s\n", VERSION);
+       return (0);
+    }
+
     /*
      * Configure program for internationalization:
      *   1) Only set the message locale for now.