prop_res.vals[i].length = strlen(sm_argv[i]);
}
- if (save_file) {
- prop_res.vals[i].value = "--sm-save-file";
- prop_res.vals[i++].length = strlen("--sm-save-file");
- prop_res.vals[i].value = save_file;
- prop_res.vals[i++].length = strlen(save_file);
- } else {
- prop_res.vals[i].value = "--sm-client-id";
- prop_res.vals[i++].length = strlen("--sm-client-id");
- prop_res.vals[i].value = sm_id;
- prop_res.vals[i++].length = strlen(sm_id);
- }
+ prop_res.vals[i].value = "--sm-save-file";
+ prop_res.vals[i++].length = strlen("--sm-save-file");
+ prop_res.vals[i].value = save_file;
+ prop_res.vals[i++].length = strlen(save_file);
props[0] = &prop_res;
props[1] = &prop_cmd;
g_free(prop_cmd.vals);
}
-static void remove_args(gint *argc, gchar ***argv, gint index, gint num)
+static void parse_args(gint argc, gchar **argv)
{
gint i;
- for (i = index; i < index + num; ++i)
- (*argv)[i] = (*argv)[i+num];
- *argc -= num;
-}
-
-static void parse_args(gint *argc, gchar ***argv)
-{
- gint i;
-
- for (i = 1; i < *argc; ++i) {
- if (!strcmp((*argv)[i], "--sm-client-id")) {
- if (i == *argc - 1) /* no args left */
+ for (i = 1; i < argc; ++i) {
+ if (!strcmp((argv)[i], "--sm-client-id")) {
+ if (i == argc - 1) /* no args left */
g_printerr(_("--sm-client-id requires an argument\n"));
else {
- sm_id = g_strdup((*argv)[i+1]);
- remove_args(argc, argv, i, 2);
+ sm_id = g_strdup((argv)[i+1]);
++i;
}
- } else if (!strcmp((*argv)[i], "--sm-save-file")) {
- if (i == *argc - 1) /* no args left */
+ } else if (!strcmp((argv)[i], "--sm-save-file")) {
+ if (i == argc - 1) /* no args left */
g_printerr(_("--sm-save-file requires an argument\n"));
else {
- save_file = g_strdup((*argv)[i+1]);
- remove_args(argc, argv, i, 2);
+ save_file = g_strdup((argv)[i+1]);
++i;
}
- } else if (!strcmp((*argv)[i], "--sm-disable")) {
+ } else if (!strcmp((argv)[i], "--sm-disable")) {
sm_disable = TRUE;
- remove_args(argc, argv, i, 1);
}
}
}
-void session_startup(gint *argc, gchar ***argv)
+void session_startup(gint argc, gchar **argv)
{
#define SM_ERR_LEN 1024
if (save_file)
session_load(save_file);
+ else {
+ gchar *filename;
+
+ /* this algo is from metacity */
+ filename = g_strdup_printf("%d-%d-%u.obs",
+ (gint) time(NULL),
+ (gint) getpid(),
+ g_random_int());
+ save_file = g_build_filename(sm_sessions_path, filename, NULL);
+ g_free(filename);
+ }
- sm_argc = *argc;
- sm_argv = *argv;
+ sm_argc = argc;
+ sm_argv = argv;
cb.save_yourself.callback = sm_save_yourself;
cb.save_yourself.client_data = NULL;
val_hint.value = &hint;
val_hint.length = 1;
- sprintf(pid, "%ld", (glong)getpid());
+ g_snprintf(pid, sizeof(pid), "%ld", (glong) getpid());
val_pid.value = pid;
val_pid.length = strlen(pid);
static gboolean session_save()
{
- gchar *filename;
FILE *f;
GList *it;
gboolean success = TRUE;
- if (save_file)
- unlink(save_file);
-
- /* this algo is from metacity */
- filename = g_strdup_printf("%d-%d-%u.obs",
- (gint) time(NULL),
- (gint) getpid(),
- g_random_int());
- save_file = g_build_filename(sm_sessions_path, filename, NULL);
- g_free(filename);
-
f = fopen(save_file, "w");
if (!f) {
success = FALSE;