334.21334.21

6 files changed, 25 insertions, 11 deletions

diff --git a/backup.c b/backup.c
index 02fce40..82c2cff 100644
--- a/backup.c
+++ b/backup.c
@@ -557,7 +557,7 @@ static int reverse_strlen_compare(const void *a, const void *b)
 static int rmdir_recursive(Options *op)
 {
     FILE *log;
-    char *dir, **dirs;
+    char **dirs;
     int eof = FALSE, ret = TRUE, lines, i;
 
     /* open the log file */
@@ -572,6 +572,7 @@ static int rmdir_recursive(Options *op)
     /* Count the number of lines */
 
     for (lines = 0; !eof; lines++) {
+        char *dir;
         dir = fget_next_line(log, &eof);
         nvfree(dir);
     }
@@ -590,7 +591,7 @@ static int rmdir_recursive(Options *op)
         if (dirs[i]) {
             /* Ignore empty lines and the backup directory itself, since it is 
              * never empty as long as the dirs file is still around. */
-            if (strlen(dirs[i]) && strcmp(dir, BACKUP_DIRECTORY) != 0) {
+            if (strlen(dirs[i]) && strcmp(dirs[i], BACKUP_DIRECTORY) != 0) {
                 if (rmdir(dirs[i]) != 0) {
                     ui_log(op, "Failed to delete the directory '%s' (%s).",
                            dirs[i], strerror(errno));
diff --git a/files.c b/files.c
index d7ec29d..c5af2df 100644
--- a/files.c
+++ b/files.c
@@ -574,8 +574,13 @@ int set_destinations(Options *op, Package *p)
 
         case FILE_TYPE_UTILITY_LIB:
         case FILE_TYPE_UTILITY_LIB_SYMLINK:
-            prefix = op->utility_prefix;
-            dir = op->utility_libdir;
+            if (p->entries[i].compat_arch == FILE_COMPAT_ARCH_COMPAT32) {
+                prefix = op->compat32_prefix;
+                dir = op->compat32_libdir;
+            } else {
+                prefix = op->utility_prefix;
+                dir = op->utility_libdir;
+            }
             path = "";
             break;
 
diff --git a/manifest.c b/manifest.c
index 39439fe..edeb9c2 100644
--- a/manifest.c
+++ b/manifest.c
@@ -74,7 +74,7 @@ static const struct {
     { ENTRY(XLIB_STATIC_LIB,        F, F, T, F, F, F, F ) },
     { ENTRY(XLIB_SHARED_LIB,        F, F, T, F, F, T, F ) },
     { ENTRY(TLS_LIB,                T, T, T, T, F, T, T ) },
-    { ENTRY(UTILITY_LIB,            F, F, T, F, F, T, F ) },
+    { ENTRY(UTILITY_LIB,            T, F, T, F, F, T, F ) },
     { ENTRY(DOCUMENTATION,          F, F, T, T, F, F, F ) },
     { ENTRY(APPLICATION_PROFILE,    F, F, T, T, F, F, F ) },
     { ENTRY(MANPAGE,                F, F, T, T, F, F, F ) },
@@ -83,7 +83,7 @@ static const struct {
     { ENTRY(CUDA_SYMLINK,           T, F, F, T, T, F, F ) },
     { ENTRY(XLIB_SYMLINK,           F, F, F, F, T, F, F ) },
     { ENTRY(TLS_SYMLINK,            T, T, F, T, T, F, T ) },
-    { ENTRY(UTILITY_LIB_SYMLINK,    F, F, F, F, T, F, F ) },
+    { ENTRY(UTILITY_LIB_SYMLINK,    T, F, F, F, T, F, F ) },
     { ENTRY(INSTALLER_BINARY,       F, F, T, F, F, F, F ) },
     { ENTRY(UTILITY_BINARY,         F, F, T, F, F, F, F ) },
     { ENTRY(UTILITY_BIN_SYMLINK,    F, F, F, F, T, F, F ) },
diff --git a/misc.c b/misc.c
index 2715d25..9a71dab 100644
--- a/misc.c
+++ b/misc.c
@@ -2646,13 +2646,20 @@ static int prompt_for_user_cancel(Options *op, const char *file,
                       NULL);
 
     ret = ui_paged_prompt(op, prompt, msglen > 0 ? "Information about the "
-                          "alternate information method" : "", message,
+                          "alternate installation method" : "", message,
                           buttons, 2, default_cancel);
 
     nvfree(message);
     nvfree(prompt);
 
-    return ret == 1;
+    if (ret == 1) {
+        ui_error(op, "The installation was canceled due to the availability "
+                 "or presence of an alternate driver installation. Please "
+                 "see %s for more details.", op->log_file_name);
+        return TRUE;
+    }
+
+    return FALSE;
 }
 
 #define INSTALL_PRESENT_FILE "alternate-install-present"
diff --git a/user-interface.c b/user-interface.c
index e30df5f..7770f70 100644
--- a/user-interface.c
+++ b/user-interface.c
@@ -409,7 +409,7 @@ int ui_multiple_choice (Options *op, const char **answers, int num_answers,
                                     default_answer);
     }
 
-    tmp = nvstrcat("(Answer: ", answers[ret], ")", NULL);
+    tmp = nvstrcat(question, " (Answer: ", answers[ret], ")", NULL);
 
     if (!op->silent) {
         __ui->message(op, NV_MSG_LEVEL_LOG, tmp);
@@ -438,7 +438,8 @@ int ui_paged_prompt (Options *op, const char *question, const char *pager_title,
                                  num_answers, default_answer);
     }
 
-    tmp = nvstrcat("(Answer: ", answers[ret], ")", NULL);
+    tmp = nvstrcat(question, "\n\n", pager_text,
+                   "\n(Answer: ", answers[ret], ")", NULL);
 
     if (!op->silent) {
         __ui->message(op, NV_MSG_LEVEL_LOG, tmp);
diff --git a/version.mk b/version.mk
index 591ef07..434103e 100644
--- a/version.mk
+++ b/version.mk
@@ -1 +1 @@
-NVIDIA_VERSION = 334.16
+NVIDIA_VERSION = 334.21