E CVS: apps/e raster

[Enlightenment C. <no...@cv...>]

Enlightenment CVS committal

Author  : raster
Project : e17
Module  : apps/e

Dir     : e17/apps/e/src/bin


Modified Files:
	e.h e_fm.c e_fm_main.c 


Log Message:


handle large files

===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e.h,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -3 -r1.61 -r1.62
--- e.h	5 Apr 2007 06:59:02 -0000	1.61
+++ e.h	2 Jun 2007 16:35:10 -0000	1.62
@@ -12,6 +12,13 @@
 #define OBJECT_CHECK
 #endif
 
+#ifndef _FILE_OFFSET_BITS
+#define _FILE_OFFSET_BITS  64
+#endif
+#ifndef __USE_FILE_OFFSET64 /* for large file support */
+#define __USE_FILE_OFFSET64
+#endif
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_fm.c,v
retrieving revision 1.174
retrieving revision 1.175
diff -u -3 -r1.174 -r1.175
--- e_fm.c	30 May 2007 14:35:26 -0000	1.174
+++ e_fm.c	2 Jun 2007 16:35:10 -0000	1.175
@@ -1797,6 +1797,28 @@
 			      }
 			 }
 		    }
+		  else
+		    {
+		       if ((sd->id == e->ref_to) && (path[0] == 0))
+			 {
+			    if (e->response == 2)/* end of scan */
+			      {
+				 sd->listing = 0;
+				 if (sd->scan_timer)
+				   {
+				      ecore_timer_del(sd->scan_timer);
+				      sd->scan_timer =
+					ecore_timer_add(0.0001, 
+							_e_fm2_cb_scan_timer,
+							sd->obj);
+				   }
+				 else
+				   {
+				      _e_fm2_client_monitor_list_end(l->data);
+				   }
+			      }
+			 }
+		   }
 		  free(evdir);
 	       }
 	     break;
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_fm_main.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -3 -r1.15 -r1.16
--- e_fm_main.c	20 May 2007 08:41:36 -0000	1.15
+++ e_fm_main.c	2 Jun 2007 16:35:10 -0000	1.16
@@ -1,6 +1,13 @@
 /*
  * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2
  */
+#ifndef _FILE_OFFSET_BITS
+#define _FILE_OFFSET_BITS  64
+#endif
+#ifndef __USE_FILE_OFFSET64 /* for large file support */
+#define __USE_FILE_OFFSET64
+#endif
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
@@ -823,11 +830,14 @@
 	       snprintf(buf, sizeof(buf), "/%s", file);
 	     else
 	       snprintf(buf, sizeof(buf), "%s/%s", ed->dir, file);
-	     if ((!ed->fq->next) ||
-		 ((!strcmp(ed->fq->next->data, ".order")) &&
-		  (!ed->fq->next->next)))
-	       _e_file_add(ed, buf, 2);
+/*	     
+	     if (//(!ed->fq->next) ||
+		 ((!strcmp(ed->fq->next->data, ".order"))
+		  //&& (!ed->fq->next->next)
+		  ))
+	       _e_file_add(ed, buf, 1);
 	     else
+ */
 	       _e_file_add(ed, buf, 1);
 	  }
 	free(file);
@@ -837,6 +847,7 @@
 	  {
 	     _e_file_mon_list_sync(ed);
 	     ed->idler = NULL;
+	     if (!ed->fq) _e_file_add(ed, "", 2);
 	     return 0;
 	  }
      }
@@ -844,6 +855,7 @@
    ed->sync = 0;
    ed->sync_time = 0.0;
    ed->idler = NULL;
+   if (!ed->fq) _e_file_add(ed, "", 2);
    return 0;
 }