open.source/espanso
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Cleaned up error messages

Browse Source
This commit is contained in:
Hendrik G. Seliger 2022-04-06 08:15:02 +02:00
parent 16ca8eba27
commit bb6e20ed10
1 changed files with 23 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
espanso-info/src/wayland/native.cpp
View File

@ -19,7 +19,7 @@
// This file: // This file:
// Created: 2022-04-04T08:37:16+02:00 by Hendrik G. Seliger (github@hseliger.eu) // Created: 2022-04-04T08:37:16+02:00 by Hendrik G. Seliger (github@hseliger.eu)
// Last changes: 2022-04-05T11:46:39+02:00 by Hendrik G. Seliger (github@hseliger.eu) // Last changes: 2022-04-06T08:10:44+02:00 by Hendrik G. Seliger (github@hseliger.eu)
// Based on an example given by Ranjit Katuri on https://stackoverflow.com/a/17645247 // Based on an example given by Ranjit Katuri on https://stackoverflow.com/a/17645247
// Uses RapidJSON header-only parser (http://rapidjson.org/) // Uses RapidJSON header-only parser (http://rapidjson.org/)
@ -50,7 +50,7 @@ static const char* methods[] = { "FocusTitle", "FocusPID", "FocusClass" };
#define MAX_CMD_LINE 120 #define MAX_CMD_LINE 120
static const char* errMessage = "Error retrieving window info. Are you on Gnome and do you have the Window Calls extension installed and active?"; static const char* gnomeReminder = "Are you on Gnome and do you have the Window Calls Extended extension installed and active?\n";
// Helper function to setup connection // Helper function to setup connection
int _vsetupconnection() int _vsetupconnection()
@ -62,10 +62,9 @@ int _vsetupconnection()
conn = dbus_bus_get(DBUS_BUS_SESSION, &err); conn = dbus_bus_get(DBUS_BUS_SESSION, &err);
if (dbus_error_is_set(&err)) { if (dbus_error_is_set(&err)) {
if (DEBUG > 0) { if (DEBUG > 0) {
::perror("Connection Error. "); fprintf(stderr, "Connection Error. (%s: %s)", err.name, err.message);
::perror(err.name);
::perror(err.message);
} }
fprintf(stderr, gnomeReminder);
dbus_error_free(&err); dbus_error_free(&err);
} }
if (NULL == conn) { if (NULL == conn) {
@ -73,7 +72,7 @@ int _vsetupconnection()
} }
else { else {
if (DEBUG > 0) { if (DEBUG > 0) {
std::cerr << "Connected to session bus\n"; fprintf(stderr, "Connected to session bus\n");
} }
return(1); return(1);
} }
@ -93,8 +92,9 @@ DBusMessage* _sendMethodCall(const char* objectpath, const char* busname, const
if (methodcall == NULL) { if (methodcall == NULL) {
if (DEBUG > 0) { if (DEBUG > 0) {
::perror("Cannot allocate DBus message!"); fprintf(stderr, "Cannot allocate DBus message!\n");
} }
fprintf(stderr, gnomeReminder);
return(NULL); return(NULL);
} }
//Now do a sync call //Now do a sync call
@ -105,8 +105,9 @@ DBusMessage* _sendMethodCall(const char* objectpath, const char* busname, const
if (!dbus_connection_send_with_reply(conn, methodcall, &pending, -1)) if (!dbus_connection_send_with_reply(conn, methodcall, &pending, -1))
{ {
if (DEBUG == 1) { if (DEBUG == 1) {
::perror("failed to send message!"); fprintf(stderr, "failed to send message!\n");
} }
fprintf(stderr, gnomeReminder);
return(NULL); return(NULL);
} }
dbus_connection_flush(conn); dbus_connection_flush(conn);
@ -123,9 +124,9 @@ DBusMessage* _sendMethodCall(const char* objectpath, const char* busname, const
if(dbus_message_get_type(reply) == DBUS_MESSAGE_TYPE_ERROR) { if(dbus_message_get_type(reply) == DBUS_MESSAGE_TYPE_ERROR) {
if (DEBUG >0 ) { if (DEBUG >0 ) {
::perror("Error!"); fprintf(stderr, "Error! %s.\n", dbus_message_get_error_name(reply));
::perror(dbus_message_get_error_name(reply));
} }
fprintf(stderr, gnomeReminder);
dbus_message_unref(reply); dbus_message_unref(reply);
reply = NULL; reply = NULL;
} }
@ -133,10 +134,15 @@ DBusMessage* _sendMethodCall(const char* objectpath, const char* busname, const
} }
void _getInformation(int infoType, char *buffer, int32_t buffer_size) { void _getInformation(int infoType, char *buffer, int32_t buffer_size) {
// If anything goes wrong, return an empty string
// Using strncpy just in case buffer size would be 0
strncpy(buffer, "", buffer_size);
// First, ensure we get a connection. Then, which should never happen, // First, ensure we get a connection. Then, which should never happen,
// but just in case ensure we have a method for the infoType // but just in case ensure we have a method for the infoType
if ( (_vsetupconnection() == 1) && (infoType <= (int)sizeof(methods)) ) { if ( (_vsetupconnection() == 1) && (infoType <= (int)sizeof(methods)) ) {
std::cerr << "Using method " << methods[infoType - 1] << "\n"; if (DEBUG >0 ) {
fprintf(stderr, "Using method %s\n", methods[infoType - 1] );
}
DBusMessage* reply = _sendMethodCall(DB_PATH, DB_DESTINATION, DB_INTERFACE, methods[infoType - 1]); DBusMessage* reply = _sendMethodCall(DB_PATH, DB_DESTINATION, DB_INTERFACE, methods[infoType - 1]);
if(reply != NULL) { if(reply != NULL) {
DBusMessageIter MsgIter; DBusMessageIter MsgIter;
@ -147,11 +153,10 @@ void _getInformation(int infoType, char *buffer, int32_t buffer_size) {
dbus_message_iter_get_basic(&MsgIter, &dbusMsg); dbus_message_iter_get_basic(&MsgIter, &dbusMsg);
if (DEBUG > 1) { if (DEBUG > 1) {
std::cerr << "Received string: " << dbusMsg << "\n"; fprintf(stderr, "Received string: %s.\n", dbusMsg);
} }
switch (infoType) { switch (infoType) {
case INFO_TITLE: case INFO_TITLE:
// std::cout << "Title: " << (*p)["title"].GetString() << "\n";
strncpy(buffer, dbusMsg, buffer_size); strncpy(buffer, dbusMsg, buffer_size);
break; break;
case INFO_EXEC: case INFO_EXEC:
@ -159,35 +164,33 @@ void _getInformation(int infoType, char *buffer, int32_t buffer_size) {
size_t pathLen = snprintf(NULL, 0, "/proc/%s/cmdline", dbusMsg); size_t pathLen = snprintf(NULL, 0, "/proc/%s/cmdline", dbusMsg);
char* pathBuffer = (char*) malloc(pathLen); char* pathBuffer = (char*) malloc(pathLen);
sprintf(pathBuffer,"/proc/%s/exe", dbusMsg); sprintf(pathBuffer,"/proc/%s/exe", dbusMsg);
// std::cout << "Proc file: " << pathBuffer << "\n";
readlink(pathBuffer, buffer, buffer_size); readlink(pathBuffer, buffer, buffer_size);
free(pathBuffer); free(pathBuffer);
} }
break; break;
case INFO_WINCLASS: case INFO_WINCLASS:
// std::cout << "Class: " << (*p)["class"].GetString() << "\n";
strncpy(buffer, dbusMsg, buffer_size); strncpy(buffer, dbusMsg, buffer_size);
break; break;
default: default:
strncpy(buffer, errMessage, buffer_size); fprintf(stderr, gnomeReminder);
} }
return; return;
} }
dbus_message_unref(reply); //unref reply dbus_message_unref(reply); //unref reply
} else { } else {
if (DEBUG == 1) { if (DEBUG == 1) {
::perror("Error! Send Message Call failed!"); fprintf(stderr, "Error! Send Message Call failed!");
} }
strncpy(buffer, errMessage, buffer_size); fprintf(stderr, gnomeReminder);
} }
// Closing gives error: Applications must not close shared connections - see dbus_connection_close() docs. // Closing gives error: Applications must not close shared connections - see dbus_connection_close() docs.
// dbus_connection_close(conn); // dbus_connection_close(conn);
} else { } else {
if (DEBUG > 0) { if (DEBUG > 0) {
::perror("Error! Could not get connection to session bus!"); fprintf(stderr, "Error! Could not get connection to session bus!");
} }
strncpy(buffer, errMessage, buffer_size); fprintf(stderr, gnomeReminder);
} }
} }