SF.net SVN: geany: [1439] trunk

[ntrel at users.sourceforge.net]

Revision: 1439
          http://svn.sourceforge.net/geany/?rev=1439&view=rev
Author:   ntrel
Date:     2007-04-05 05:07:46 -0700 (Thu, 05 Apr 2007)

Log Message:
-----------
Make \" filename quoting optional when creating a global tags file
(quoting is useful if glob matching is needed). Run geany -g for
example usage.

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/src/symbols.c
    trunk/tagmanager/tm_workspace.c

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2007-04-05 11:53:52 UTC (rev 1438)
+++ trunk/ChangeLog	2007-04-05 12:07:46 UTC (rev 1439)
@@ -8,6 +8,10 @@
    Find in Files section.
  * src/keybindings.c:
    Only construct-complete when the editor widget has focus.
+ * src/symbols.c, tagmanager/tm_workspace.c:
+   Make \" filename quoting optional when creating a global tags file
+   (quoting is useful if glob matching is needed). Run geany -g for
+   example usage.
 
 
 2007-04-03  Nick Treleaven  <nick.treleaven at btinternet.com>

Modified: trunk/src/symbols.c
===================================================================
--- trunk/src/symbols.c	2007-04-05 11:53:52 UTC (rev 1438)
+++ trunk/src/symbols.c	2007-04-05 12:07:46 UTC (rev 1439)
@@ -724,10 +724,9 @@
 	else
 	{
 		fprintf(stderr, "Usage: %s -g <Tag File> <File list>\n\n", argv[0]);
-		fprintf(stderr, "Each file in <File list> must be enclosed in double quotes.\n");
 		fprintf(stderr, "Example:\n"
 			"CFLAGS=`pkg-config gtk+-2.0 --cflags` %s -g gtk2.c.tags"
-			" \\\"/usr/include/gtk-2.0/gtk/gtk.h\\\"\n", argv[0]);
+			" /usr/include/gtk-2.0/gtk/gtk.h\n", argv[0]);
 		return 1;
 	}
 	return 0;

Modified: trunk/tagmanager/tm_workspace.c
===================================================================
--- trunk/tagmanager/tm_workspace.c	2007-04-05 11:53:52 UTC (rev 1438)
+++ trunk/tagmanager/tm_workspace.c	2007-04-05 12:07:46 UTC (rev 1439)
@@ -219,6 +219,8 @@
 
 #ifdef HAVE_GLOB_H
 	globbuf.gl_offs = 0;
+
+	if (includes[0][0] == '"')	// leading \" char for glob matching
 	for(idx_inc = 0; idx_inc < includes_count; idx_inc++)
 	{
  		int dirty_len = strlen(includes[idx_inc]);
@@ -254,7 +256,8 @@
 		globfree(&globbuf);
 		free(clean_path);
   	}
-#else	// no glob support
+  	else
+#endif
 	for(idx_inc = 0; idx_inc < includes_count; idx_inc++)
 	{
 		if (!g_hash_table_lookup(includes_files_hash,
@@ -265,9 +268,7 @@
 								file_name_copy);
 		}
   	}
-#endif
 
-
 	/* Checks for duplicate file entries which would case trouble */
 	g_hash_table_foreach(includes_files_hash, tm_move_entries_to_g_list,
 						 &includes_files);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.