Changeset 2119

Timestamp:

06/02/07 01:49:07 (6 years ago)

Author:

laforge

Message:

use PATH_MAX where apropriate

Location:

trunk/src/target/OM-2007/panel-plugins/openmoko-panel-mainmenu/src

Files:

• mokodesktop.c (modified) (5 diffs)
• mokodesktop.h (modified) (1 diff)
• stylusmenu.c (modified) (3 diffs)

trunk/src/target/OM-2007/panel-plugins/openmoko-panel-mainmenu/src/mokodesktop.c

@@ -180 +180 @@
   struct stat    stat_info;
 
-  char vfolder_path_root[512];
-  char vfolder_path[512];
-  char orig_wd[256];
+  char vfolder_path_root[PATH_MAX];
+  char vfolder_path[PATH_MAX];
+  char orig_wd[PATH_MAX];
 
   int   desktops_dirs_n  = APP_PATHS_N;
@@ -193 +193 @@
   MBDotDesktop            *dd, *user_overides = NULL;
 
-  char                     app_paths[APP_PATHS_N][256];
+  char                     app_paths[APP_PATHS_N][PATH_MAX];
   struct dirent          **namelist;
 /*
@@ -203 +203 @@
         ItemTypeDotDesktop  = type_reg_cnt;
   
-  snprintf( vfolder_path_root, 512, "%s/.matchbox/vfolders/Root.directory", 
+  snprintf( vfolder_path_root, PATH_MAX, "%s/.matchbox/vfolders/Root.directory", 
             mb_util_get_homedir());
-  snprintf( vfolder_path, 512, "%s/.matchbox/vfolders", 
+  snprintf( vfolder_path, PATH_MAX, "%s/.matchbox/vfolders", 
             mb_util_get_homedir());
 
  if (stat(vfolder_path_root, &stat_info))
     {
-      snprintf(vfolder_path_root, 512, VFOLDERDIR"/vfolders/Root.directory");
-      snprintf(vfolder_path, 512, VFOLDERDIR "/vfolders" );
+      snprintf(vfolder_path_root, PATH_MAX, VFOLDERDIR"/vfolders/Root.directory");
+      snprintf(vfolder_path, PATH_MAX, VFOLDERDIR "/vfolders" );
     }
  
@@ -249 +249 @@
   
   
-  //snprintf(app_paths[0], 256, "%s/applications", DATADIR);
-  snprintf(app_paths[0], 256, "/usr/share/applications");
-  snprintf(app_paths[1], 256, "/usr/share/applications");
-  snprintf(app_paths[2], 256, "/usr/local/share/applications");
-  snprintf(app_paths[3], 256, "%s/.applications", mb_util_get_homedir());
-
-  if (getcwd(orig_wd, 255) == (char *)NULL)
+  //snprintf(app_paths[0], PATH_MAX-1, "%s/applications", DATADIR);
+  snprintf(app_paths[0], PATH_MAX-1, "/usr/share/applications");
+  snprintf(app_paths[1], PATH_MAX-1, "/usr/share/applications");
+  snprintf(app_paths[2], PATH_MAX-1, "/usr/local/share/applications");
+  snprintf(app_paths[3], PATH_MAX-1, "%s/.applications", mb_util_get_homedir());
+
+  if (getcwd(orig_wd, PATH_MAX-1) == (char *)NULL)
     {
       fprintf(stderr, "Cant get current directory\n");
@@ -301 +301 @@
                           {
                               MokoDesktopItem *folder = NULL;
-                              char             full_path[512];
+                              char             full_path[PATH_MAX];
                               char          *folder_name = NULL;
 

trunk/src/target/OM-2007/panel-plugins/openmoko-panel-mainmenu/src/mokodesktop.h

@@ -9 +9 @@
 #include <signal.h>
 #include <sys/types.h>
+#include <sys/param.h>
 #include <sys/stat.h>
 #include <dirent.h>

trunk/src/target/OM-2007/panel-plugins/openmoko-panel-mainmenu/src/stylusmenu.c

@@ -4 +4 @@
  *  Authored by Sun Zhiyong <sunzhiyong@fic-sh.com.cn>
  *
- *  Copyright (C) 2006 First International Computer Inc.
+ *  Copyright (C) 2006-2007 OpenMoko, Inc.
  *
  *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU Public License as published by
- *  the Free Software Foundation; version 2.1 of the license.
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; version 2.0 of the license.
  *
  *  This program is distributed in the hope that it will be useful,
@@ -42 +42 @@
      else
      {
-       char path[512];
-       snprintf (path, 512, "%s/%s", PIXMAP_PATH, item_new->icon_name);
+       char path[PATH_MAX];
+       snprintf (path, PATH_MAX, "%s/%s", PIXMAP_PATH, item_new->icon_name);
        if (access (path, 0) == 0)
            menu_item = moko_build_new_menu_item (item_new->name, path);
        else
          {
-             snprintf (path, 512, "%s/%s", PKGDATADIR, "default-app-icon.xpm");
+             snprintf (path, PATH_MAX, "%s/%s", PKGDATADIR, "default-app-icon.xpm");
              menu_item = moko_build_new_menu_item (item_new->name, path);
              //moko_fill_model(self->list_store, path, item_new->name, item_new);
@@ -70 +70 @@
         else
         {
-          char path[512];
-          snprintf (path, 512, "%s/%s", PIXMAP_PATH, tmp_item->icon_name);
+          char path[PATH_MAX];
+          snprintf (path, PATH_MAX, "%s/%s", PIXMAP_PATH, tmp_item->icon_name);
           if (access (path, 0) == 0)
             menu_item = moko_build_new_menu_item (tmp_item->name, path);
           else
           {
-                snprintf (path, 512, "%s/%s", PKGDATADIR, "default-app-icon.xpm");
+                snprintf (path, PATH_MAX, "%s/%s", PKGDATADIR, "default-app-icon.xpm");
                 menu_item = moko_build_new_menu_item (tmp_item->name, path);
              //moko_fill_model(self->list_store, path, item_new->name, item_new);