Enlightenment CVS committal
Author : sebastid
Project : e17
Module : apps/e_utils
Dir : e17/apps/e_utils/src/bin/e17genmenu
Modified Files:
eaps.c global.c global.h main.c menus.c order.c parse.c sort.c
Log Message:
compile again.
===================================================================
RCS file: /cvs/e/e17/apps/e_utils/src/bin/e17genmenu/eaps.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -3 -r1.9 -r1.10
--- eaps.c 11 Aug 2006 13:50:04 -0000 1.9
+++ eaps.c 17 Aug 2006 17:08:07 -0000 1.10
@@ -71,7 +71,7 @@
void
create_dir_eap(char *path, char *cat)
{
- char path2[MAX_PATH];
+ char path2[PATH_MAX];
G_Eap eap;
memset(&eap, 0, sizeof(G_Eap));
===================================================================
RCS file: /cvs/e/e17/apps/e_utils/src/bin/e17genmenu/global.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- global.c 14 Aug 2006 05:45:06 -0000 1.5
+++ global.c 17 Aug 2006 17:08:07 -0000 1.6
@@ -74,7 +74,7 @@
get_eap_name(char *file)
{
char *tmp2;
- char eap[MAX_PATH];
+ char eap[PATH_MAX];
tmp2 = strdup(ecore_file_get_file(file));
if (!tmp2)
@@ -152,7 +152,7 @@
{
int result;
char *file;
- char path[MAX_PATH], tmp[MAX_PATH], dest[MAX_PATH];
+ char path[PATH_MAX], tmp[PATH_MAX], dest[PATH_MAX];
Ecore_List *eaps = NULL;
/* Check That Dir All Exists */
@@ -201,7 +201,7 @@
write_mapping_file(G_Eap *eap)
{
FILE *f;
- char buff[MAX_PATH], path[MAX_PATH];
+ char buff[PATH_MAX], path[PATH_MAX];
if ((!eap->icon) || (!eap->name) || (!eap->exec) || (!eap->window_class))
return;
===================================================================
RCS file: /cvs/e/e17/apps/e_utils/src/bin/e17genmenu/global.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- global.h 11 Aug 2006 13:50:04 -0000 1.5
+++ global.h 17 Aug 2006 17:08:07 -0000 1.6
@@ -2,6 +2,7 @@
#define GLOBAL_H
#include <stdlib.h>
+#include <limits.h>
#include <stdio.h>
#include <string.h>
#include <unistd.h>
===================================================================
RCS file: /cvs/e/e17/apps/e_utils/src/bin/e17genmenu/main.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -3 -r1.11 -r1.12
--- main.c 14 Aug 2006 21:44:44 -0000 1.11
+++ main.c 17 Aug 2006 17:08:07 -0000 1.12
@@ -65,7 +65,7 @@
void
_e17genmenu_init()
{
- char path[MAX_PATH];
+ char path[PATH_MAX];
/* Setup Ecore */
if (!ecore_init())
@@ -118,7 +118,7 @@
int
main(int argc, char **argv)
{
- char path[MAX_PATH];
+ char path[PATH_MAX];
double start, begin, paths, gen;
//#ifdef DEBUG
char *this_path;
===================================================================
RCS file: /cvs/e/e17/apps/e_utils/src/bin/e17genmenu/menus.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- menus.c 14 Aug 2006 06:50:28 -0000 1.8
+++ menus.c 17 Aug 2006 17:08:07 -0000 1.9
@@ -65,7 +65,7 @@
ecore_desktop_tree_foreach(menus, 0, _menu_make_apps,
path);
}
}
- E_FREE(path);
+ if (path) free(path);
}
}
@@ -78,7 +78,7 @@
check_for_dirs(char *path)
{
char *dir;
- char dirs[MAX_PATH];
+ char dirs[PATH_MAX];
snprintf(dirs, sizeof(dirs), path);
dir = path; //strdup(path);
@@ -109,7 +109,7 @@
check_for_files(char *dir)
{
char *file;
- char path[MAX_PATH];
+ char path[PATH_MAX];
Ecore_List *files = NULL;
#ifdef DEBUG
===================================================================
RCS file: /cvs/e/e17/apps/e_utils/src/bin/e17genmenu/order.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- order.c 5 Jul 2006 02:54:42 -0000 1.2
+++ order.c 17 Aug 2006 17:08:07 -0000 1.3
@@ -42,7 +42,7 @@
{
int length, i;
char *buff, *cat;
- char buffer[MAX_PATH], path2[MAX_PATH], t[MAX_PATH];
+ char buffer[PATH_MAX], path2[PATH_MAX], t[PATH_MAX];
FILE *f;
Ecore_List *list = NULL;
===================================================================
RCS file: /cvs/e/e17/apps/e_utils/src/bin/e17genmenu/parse.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -3 -r1.13 -r1.14
--- parse.c 14 Aug 2006 21:44:44 -0000 1.13
+++ parse.c 17 Aug 2006 17:08:07 -0000 1.14
@@ -162,8 +162,8 @@
}
FILE *f;
- char buff[MAX_PATH];
- char map_path[MAX_PATH];
+ char buff[PATH_MAX];
+ char map_path[PATH_MAX];
snprintf(map_path, sizeof(map_path), "%s/MAPPING", home);
f = fopen(map_path, "a+");
@@ -184,7 +184,7 @@
_parse_process_file(char *file, char *menu_path, G_Eap *eap)
{
char *home, *category, *icon_size, *icon_theme;
- char path[MAX_PATH], order_path[MAX_PATH];
+ char path[PATH_MAX], order_path[PATH_MAX];
int overwrite;
if (!eap)
@@ -234,7 +234,7 @@
parse_debian_file(char *file)
{
char *name, *generic, *comment, *exec, *category, *icon;
- char buffer[MAX_PATH];
+ char buffer[PATH_MAX];
int overwrite, length;
FILE *f;
G_Eap *eap;
===================================================================
RCS file: /cvs/e/e17/apps/e_utils/src/bin/e17genmenu/sort.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- sort.c 14 Aug 2006 05:45:06 -0000 1.3
+++ sort.c 17 Aug 2006 17:08:07 -0000 1.4
@@ -57,7 +57,7 @@
sort_menu(char *path)
{
char *home, *name, *v, *token;
- char path2[MAX_PATH], buffer[MAX_PATH];
+ char path2[PATH_MAX], buffer[PATH_MAX];
int length, j;
FILE *f;
Ecore_List *eaps = NULL;
@@ -78,7 +78,7 @@
/* Sort Names */
eaps = ecore_list_new();
*buffer = 0;
- while (fgets(buffer, MAX_PATH, f) != NULL)
+ while (fgets(buffer, PATH_MAX, f) != NULL)
{
if (!(*buffer) || (*buffer == '\n'))
continue;
@@ -129,7 +129,7 @@
sort_menus()
{
char *home, *file;
- char path[MAX_PATH];
+ char path[PATH_MAX];
Ecore_List *list = NULL;
#ifdef DEBUG
@@ -161,7 +161,7 @@
{
int length;
char *home, *file;
- char path[MAX_PATH], buffer[MAX_PATH];
+ char path[PATH_MAX], buffer[PATH_MAX];
Ecore_List *list = NULL, *dir = NULL;
FILE *f;
-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
