1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
|
--- plugins/symbol-db/symbol-db-engine-core.c.orig 2009-08-27 09:17:03.000000000 +0200
+++ plugins/symbol-db/symbol-db-engine-core.c 2009-08-27 17:32:35.000000000 +0200
@@ -1504,7 +1504,7 @@ sdb_engine_ctags_output_thread (gpointer
/* found out a new marker */
marker_ptr = strstr (marker_ptr + len_marker, CTAGS_MARKER);
- } while (remaining_chars + len_marker < len_chars || marker_ptr != NULL);
+ } while (remaining_chars > 0 || marker_ptr != NULL);
}
else
{
@@ -1831,8 +1831,8 @@ sdb_engine_scan_files_1 (SymbolDBEngine
gint i = 0;
while (TRUE)
{
- temp_file = g_strdup_printf ("/anjuta-%d_%ld%d.tags", getpid (),
- time (NULL), i++);
+ temp_file = g_strdup_printf ("%s/anjuta-%d_%ld%d.tags", SHARED_MEMORY_PREFIX, getpid (),
+ (long) time (NULL), i++);
gchar *test;
test = g_strconcat (SHARED_MEMORY_PREFIX, temp_file, NULL);
if (g_file_test (test, G_FILE_TEST_EXISTS) == TRUE)
@@ -1852,12 +1852,12 @@ sdb_engine_scan_files_1 (SymbolDBEngine
priv->shared_mem_str = temp_file;
if ((priv->shared_mem_fd =
- shm_open (temp_file, O_CREAT|O_RDWR, S_IRUSR|S_IWUSR)) < 0)
+ open (temp_file, O_CREAT|O_RDWR, S_IRUSR|S_IWUSR)) < 0)
{
g_warning ("Error while trying to open a shared memory file. Be"
"sure to have "SHARED_MEMORY_PREFIX" mounted with tmpfs");
}
-
+
priv->shared_mem_file = fdopen (priv->shared_mem_fd, "a+b");
/*DEBUG_PRINT ("temp_file %s", temp_file);*/
@@ -2446,7 +2446,7 @@ sdb_engine_init (SymbolDBEngine * object
static void
sdb_engine_unlink_shared_files (gpointer key, gpointer value, gpointer user_data)
{
- shm_unlink (key);
+ unlink (key);
}
static void
@@ -2535,7 +2535,7 @@ sdb_engine_finalize (GObject * object)
if (priv->shared_mem_str)
{
- shm_unlink (priv->shared_mem_str);
+ unlink (priv->shared_mem_str);
g_free (priv->shared_mem_str);
priv->shared_mem_str = NULL;
}
@@ -6059,12 +6059,12 @@ symbol_db_engine_update_buffer_symbols (
* target buffer one */
base_filename = g_filename_display_basename (relative_path);
- shared_temp_file = g_strdup_printf ("/anjuta-%d-%ld-%s", getpid (),
- time (NULL), base_filename);
+ shared_temp_file = g_strdup_printf ("%s/anjuta-%d-%ld-%s", SHARED_MEMORY_PREFIX, getpid (),
+ (long) time (NULL), base_filename);
g_free (base_filename);
if ((buffer_mem_fd =
- shm_open (shared_temp_file, O_CREAT|O_RDWR, S_IRUSR|S_IWUSR)) < 0)
+ open (shared_temp_file, O_CREAT|O_RDWR, S_IRUSR|S_IWUSR)) < 0)
{
g_warning ("Error while trying to open a shared memory file. Be"
"sure to have "SHARED_MEMORY_PREFIX" mounted with tmpfs");
|
