From 4334feaacedabf828dbd82ec9c12a15a4727bd46 Mon Sep 17 00:00:00 2001 From: Ray Strode Date: Fri, 23 Mar 2018 10:48:44 -0400 Subject: [PATCH] jsauthority: add UTF8 suffix to renamed functions Signed-off-by: Ray Strode https://bugs.freedesktop.org/show_bug.cgi?id=105865 --- src/polkitbackend/polkitbackendjsauthority.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/polkitbackend/polkitbackendjsauthority.cpp b/src/polkitbackend/polkitbackendjsauthority.cpp index a3a21f1..e8714cf 100644 --- a/src/polkitbackend/polkitbackendjsauthority.cpp +++ b/src/polkitbackend/polkitbackendjsauthority.cpp @@ -1273,61 +1273,61 @@ polkit_backend_js_authority_check_authorization_sync (PolkitBackendInteractiveAu good = TRUE; out: if (!good) ret = POLKIT_IMPLICIT_AUTHORIZATION_NOT_AUTHORIZED; g_free (ret_str); JS_MaybeGC (authority->priv->cx); JS_EndRequest (authority->priv->cx); return ret; } /* ---------------------------------------------------------------------------------------------------- */ static JSBool js_polkit_log (JSContext *cx, unsigned argc, jsval *vp) { /* PolkitBackendJsAuthority *authority = POLKIT_BACKEND_JS_AUTHORITY (JS_GetContextPrivate (cx)); */ JSBool ret = JS_FALSE; JSString *str; char *s; if (!JS_ConvertArguments (cx, argc, JS_ARGV (cx, vp), "S", &str)) goto out; s = JS_EncodeString (cx, str); - JS_ReportWarning (cx, s); + JS_ReportWarningUTF8 (cx, s); JS_free (cx, s); ret = JS_TRUE; JS_SET_RVAL (cx, vp, JSVAL_VOID); /* return undefined */ out: return ret; } /* ---------------------------------------------------------------------------------------------------- */ static const gchar * get_signal_name (gint signal_number) { switch (signal_number) { #define _HANDLE_SIG(sig) case sig: return #sig; _HANDLE_SIG (SIGHUP); _HANDLE_SIG (SIGINT); _HANDLE_SIG (SIGQUIT); _HANDLE_SIG (SIGILL); _HANDLE_SIG (SIGABRT); _HANDLE_SIG (SIGFPE); _HANDLE_SIG (SIGKILL); _HANDLE_SIG (SIGSEGV); _HANDLE_SIG (SIGPIPE); _HANDLE_SIG (SIGALRM); _HANDLE_SIG (SIGTERM); _HANDLE_SIG (SIGUSR1); _HANDLE_SIG (SIGUSR2); @@ -1369,134 +1369,134 @@ spawn_cb (GObject *source_object, SpawnData *data = (SpawnData *)user_data; data->res = (GAsyncResult*)g_object_ref (res); g_main_loop_quit (data->loop); } static JSBool js_polkit_spawn (JSContext *cx, unsigned js_argc, jsval *vp) { /* PolkitBackendJsAuthority *authority = POLKIT_BACKEND_JS_AUTHORITY (JS_GetContextPrivate (cx)); */ JSBool ret = JS_FALSE; JSObject *array_object; gchar *standard_output = NULL; gchar *standard_error = NULL; gint exit_status; GError *error = NULL; JSString *ret_jsstr; guint32 array_len; gchar **argv = NULL; GMainContext *context = NULL; GMainLoop *loop = NULL; SpawnData data = {0}; guint n; if (!JS_ConvertArguments (cx, js_argc, JS_ARGV (cx, vp), "o", &array_object)) goto out; if (!JS_GetArrayLength (cx, array_object, &array_len)) { - JS_ReportError (cx, "Failed to get array length"); + JS_ReportErrorUTF8 (cx, "Failed to get array length"); goto out; } argv = g_new0 (gchar*, array_len + 1); for (n = 0; n < array_len; n++) { jsval elem_val; char *s; if (!JS_GetElement (cx, array_object, n, &elem_val)) { - JS_ReportError (cx, "Failed to get element %d", n); + JS_ReportErrorUTF8 (cx, "Failed to get element %d", n); goto out; } if (!JSVAL_IS_STRING (elem_val)) { - JS_ReportError (cx, "Element %d is not a string", n); + JS_ReportErrorUTF8 (cx, "Element %d is not a string", n); goto out; } s = JS_EncodeString (cx, JSVAL_TO_STRING (elem_val)); argv[n] = g_strdup (s); JS_free (cx, s); } context = g_main_context_new (); loop = g_main_loop_new (context, FALSE); g_main_context_push_thread_default (context); data.loop = loop; utils_spawn ((const gchar *const *) argv, 10, /* timeout_seconds */ NULL, /* cancellable */ spawn_cb, &data); g_main_loop_run (loop); g_main_context_pop_thread_default (context); if (!utils_spawn_finish (data.res, &exit_status, &standard_output, &standard_error, &error)) { - JS_ReportError (cx, + JS_ReportErrorUTF8 (cx, "Error spawning helper: %s (%s, %d)", error->message, g_quark_to_string (error->domain), error->code); g_clear_error (&error); goto out; } if (!(WIFEXITED (exit_status) && WEXITSTATUS (exit_status) == 0)) { GString *gstr; gstr = g_string_new (NULL); if (WIFEXITED (exit_status)) { g_string_append_printf (gstr, "Helper exited with non-zero exit status %d", WEXITSTATUS (exit_status)); } else if (WIFSIGNALED (exit_status)) { g_string_append_printf (gstr, "Helper was signaled with signal %s (%d)", get_signal_name (WTERMSIG (exit_status)), WTERMSIG (exit_status)); } g_string_append_printf (gstr, ", stdout=`%s', stderr=`%s'", standard_output, standard_error); - JS_ReportError (cx, gstr->str); + JS_ReportErrorUTF8 (cx, gstr->str); g_string_free (gstr, TRUE); goto out; } ret = JS_TRUE; ret_jsstr = JS_NewStringCopyZ (cx, standard_output); JS_SET_RVAL (cx, vp, STRING_TO_JSVAL (ret_jsstr)); out: g_strfreev (argv); g_free (standard_output); g_free (standard_error); g_clear_object (&data.res); if (loop != NULL) g_main_loop_unref (loop); if (context != NULL) g_main_context_unref (context); return ret; } /* ---------------------------------------------------------------------------------------------------- */ static JSBool js_polkit_user_is_in_netgroup (JSContext *cx, unsigned argc, jsval *vp) { /* PolkitBackendJsAuthority *authority = POLKIT_BACKEND_JS_AUTHORITY (JS_GetContextPrivate (cx)); */ -- 2.16.2