177.67177.67

6 files changed, 22 insertions, 3 deletions

diff --git a/DRIVER_VERSION b/DRIVER_VERSION
index 527d088..ed365b7 100644
--- a/DRIVER_VERSION
+++ b/DRIVER_VERSION
@@ -1 +1 @@
-177.13
+177.67
diff --git a/misc.c b/misc.c
index 540ae2e..10304ac 100644
--- a/misc.c
+++ b/misc.c
@@ -700,7 +700,9 @@ int find_system_utils(Options *op)
         { "grep",     "grep" },
         { "dmesg",    "util-linux" },
         { "tail",     "coreutils" },
-        { "cut",      "coreutils" }
+        { "cut",      "coreutils" },
+        { "tr",       "coreutils" },
+        { "sed",      "sed" }
     };
     
     /* keep in sync with the SystemOptionalUtils enum type */
diff --git a/nvidia-installer.c b/nvidia-installer.c
index 394be97..69059b3 100644
--- a/nvidia-installer.c
+++ b/nvidia-installer.c
@@ -77,7 +77,7 @@ static void print_version(void)
                 "The NVIDIA Accelerated Graphics Driver Set for %s-%s.",
                 INSTALLER_OS, INSTALLER_ARCH);
     fmtout("");
-    fmtoutp(TAB, "Copyright (C) 2003 NVIDIA Corporation.");
+    fmtoutp(TAB, "Copyright (C) 2003 - 2008 NVIDIA Corporation.");
     fmtout("");
 }
 
diff --git a/nvidia-installer.h b/nvidia-installer.h
index e664dbf..509e441 100644
--- a/nvidia-installer.h
+++ b/nvidia-installer.h
@@ -46,6 +46,8 @@ typedef enum {
     DMESG,
     TAIL,
     CUT,
+    TR,
+    SED,
     MAX_SYSTEM_UTILS
 } SystemUtils;
 
diff --git a/snarf.c b/snarf.c
index 147fcb5..35d8e81 100644
--- a/snarf.c
+++ b/snarf.c
@@ -68,6 +68,12 @@ int snarf(Options *op, const char *url, int out_fd, uint32 flags)
     UrlResource *rsrc = NULL;
     int ret;
     
+    if (op->no_network) {
+        ui_error(op, "Unable to access file '%s', because the '--no-network' "
+                 "commandline option was specified.", url);
+        return FALSE;
+    }
+
     rsrc = url_resource_new();
     rsrc->url = url_new();
     rsrc->op = op;
diff --git a/update.c b/update.c
index 3615db5..ed491b2 100644
--- a/update.c
+++ b/update.c
@@ -284,6 +284,15 @@ static int get_latest_driver_version_and_filename(Options *op,
     url = nvstrcat(op->ftp_site, "/XFree86/", INSTALLER_OS, "-",
                    INSTALLER_ARCH, "/latest.txt", NULL);
     
+    /* check for no_network option */
+
+    if (op->no_network) {
+        ui_error(op, "Unable to determine most recent NVIDIA %s-%s driver "
+                   "version: cannot access '%s', because the '--no-network' "
+                   "commandline option was specified.", INSTALLER_OS, INSTALLER_ARCH, url);
+        goto done;
+    }
+    
     if ((fd = mkstemp(tmpfile)) == -1) {
         ui_error(op, "Unable to create temporary file (%s)", strerror(errno));
         goto done;