X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=mailcheck.c;h=a4d36701bdbcd73dc57d4f0725d9daaeee272f98;hb=bb70624e964126b7ac4ff085ba163a9c35ffa18f;hp=8d3f833d54b89a2bd8cbfb42396003497b045992;hpb=d166f048818e10cf3799aa24a174fb22835f1acc;p=platform%2Fupstream%2Fbash.git

diff --git a/mailcheck.c b/mailcheck.c
index 8d3f833..a4d3670 100644
--- a/mailcheck.c
+++ b/mailcheck.c
@@ -6,7 +6,7 @@ This file is part of GNU Bash, the Bourne Again SHell.
 
 Bash 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; either version 1, or (at your option) any later
+Software Foundation; either version 2, or (at your option) any later
 version.
 
 Bash is distributed in the hope that it will be useful, but WITHOUT ANY
@@ -16,14 +16,16 @@ for more details.
 
 You should have received a copy of the GNU General Public License along
 with Bash; see the file COPYING.  If not, write to the Free Software
-Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
+Foundation, 59 Temple Place, Suite 330, Boston, MA 02111 USA. */
 
 #include "config.h"
 
 #include <stdio.h>
 #include "bashtypes.h"
 #include "posixstat.h"
-#include <sys/param.h>
+#ifndef _MINIX
+#  include <sys/param.h>
+#endif
 #if defined (HAVE_UNISTD_H)
 #  include <unistd.h>
 #endif
@@ -44,7 +46,7 @@ typedef struct {
   char *msg;
   time_t access_time;
   time_t mod_time;
-  long file_size;
+  off_t file_size;
 } FILEINFO;
 
 /* The list of remembered mail files. */
@@ -117,7 +119,7 @@ find_mail_file (file)
   do \
     { \
       mailfiles[i]->access_time = mailfiles[i]->mod_time = 0; \
-      mailfiles[i]->file_size = 0L; \
+      mailfiles[i]->file_size = 0; \
     } \
   while (0)
 
@@ -150,14 +152,14 @@ add_mail_file (file, msg)
   int i;
 
   filename = full_pathname (file);
-  i = find_mail_file (file);
+  i = find_mail_file (filename);
   if (i >= 0)
     {
       if (stat (filename, &finfo) == 0)
 	{
 	  mailfiles[i]->mod_time = finfo.st_mtime;
 	  mailfiles[i]->access_time = finfo.st_atime;
-	  mailfiles[i]->file_size = (long)finfo.st_size;
+	  mailfiles[i]->file_size = finfo.st_size;
 	}
       free (filename);
       return i;
@@ -248,7 +250,7 @@ static int
 file_has_grown (i)
      int i;
 {
-  long size;
+  off_t size;
   struct stat finfo;
   char *file;
 
@@ -291,6 +293,7 @@ make_default_mailpath ()
 {
   char *mp;
 
+  get_current_user_info ();
   mp = xmalloc (2 + sizeof (DEFAULT_MAIL_DIRECTORY) + strlen (current_user.user_name));
   strcpy (mp, DEFAULT_MAIL_DIRECTORY);
   mp[sizeof(DEFAULT_MAIL_DIRECTORY) - 1] = '/';