Add file header to nfs.h; better handling of NFS shares; update copyright information on headers

2 files changed, 39 insertions, 13 deletions

diff --git a/hardinfo2/arch/linux/common/nfs.h b/hardinfo2/arch/linux/common/nfs.h
index 5ae22797..894680db 100644
--- a/hardinfo2/arch/linux/common/nfs.h
+++ b/hardinfo2/arch/linux/common/nfs.h
@@ -1,8 +1,27 @@
+/*
+ *    HardInfo - Displays System Information
+ *    Copyright (C) 2003-2009 Leandro A. F. Pereira <leandro@hardinfo.org>
+ *
+ *    This program is free software; you can redistribute it and/or modify
+ *    it under the terms of the GNU General Public License as published by
+ *    the Free Software Foundation, version 2.
+ *
+ *    This program is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *    GNU General Public License for more details.
+ *
+ *    You should have received a copy of the GNU General Public License
+ *    along with this program; if not, write to the Free Software
+ *    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ */
+
 static gchar *nfs_shares_list = NULL;
 void
 scan_nfs_shared_directories(void)
 {
     FILE *exports;
+    gint count = 0;
     gchar buf[512];
     
     if (nfs_shares_list) {
@@ -11,19 +30,26 @@ scan_nfs_shared_directories(void)
 
     nfs_shares_list = g_strdup("");
     
-    exports = fopen("/etc/exports", "r");
-    if (!exports)
-        return;
-        
-    while (fgets(buf, 512, exports)) {
-        if (buf[0] != '/')
-            continue;
-        
-        strend(buf, ' ');
-        strend(buf, '\t');
+    if ((exports = fopen("/etc/exports", "r"))) {
+        while (fgets(buf, 512, exports)) {
+            if (buf[0] != '/')
+                continue;
+            
+            strend(buf, ' ');
+            strend(buf, '\t');
+
+            nfs_shares_list = h_strdup_cprintf("%s=\n", 
+                                               buf, nfs_shares_list);
+            count++;
+        }
 
-        nfs_shares_list = g_strconcat(nfs_shares_list, buf, "=\n", NULL);
+        fclose(exports);
+    }
+
+    if (!count) {
+        g_free(nfs_shares_list);
+        
+        nfs_shares_list = g_strdup("No NFS exports=\n");
     }
-    fclose(exports);
 }
 
diff --git a/hardinfo2/arch/linux/common/samba.h b/hardinfo2/arch/linux/common/samba.h
index 8e1f7111..1208b3f3 100644
--- a/hardinfo2/arch/linux/common/samba.h
+++ b/hardinfo2/arch/linux/common/samba.h
@@ -1,6 +1,6 @@
 /*
  *    HardInfo - Displays System Information
- *    Copyright (C) 2003-2006 Leandro A. F. Pereira <leandro@hardinfo.org>
+ *    Copyright (C) 2003-2009 Leandro A. F. Pereira <leandro@hardinfo.org>
  *
  *    This program is free software; you can redistribute it and/or modify
  *    it under the terms of the GNU General Public License as published by