1 files changed, 55 insertions, 13 deletions

diff --git a/cli/mmcli-modem-messaging.c b/cli/mmcli-modem-messaging.c
index e470e7a3..bd02b7e0 100644
--- a/cli/mmcli-modem-messaging.c
+++ b/cli/mmcli-modem-messaging.c
@@ -46,6 +46,7 @@ static Context *ctx;
 static gboolean status_flag;
 static gboolean list_flag;
 static gchar *create_str;
+static gchar *create_with_data_str;
 static gchar *delete_str;
 
 static GOptionEntry entries[] = {
@@ -61,6 +62,10 @@ static GOptionEntry entries[] = {
       "Create a new SMS in a given modem",
       "[\"key=value,...\"]"
     },
+    { "messaging-create-sms-with-data", 0, 0, G_OPTION_ARG_STRING, &create_with_data_str,
+      "Pass the given file as data contents when creating a new SMS",
+      "[File path]"
+    },
     { "messaging-delete-sms", 0, 0, G_OPTION_ARG_STRING, &delete_str,
       "Delete a SMS from a given modem",
       "[PATH]"
@@ -102,6 +107,12 @@ mmcli_modem_messaging_options_enabled (void)
         exit (EXIT_FAILURE);
     }
 
+    if (create_with_data_str && !create_str) {
+        g_printerr ("error: `--messaging-create-with-data' must be given along "
+                    "with `--messaging-create-sms'\n");
+        exit (EXIT_FAILURE);
+    }
+
     if (status_flag)
         mmcli_force_sync_operation ();
 
@@ -148,6 +159,46 @@ mmcli_modem_messaging_shutdown (void)
     context_free (ctx);
 }
 
+static MMSmsProperties *
+build_sms_properties_from_input (const gchar *properties_string,
+                                 const gchar *data_file)
+{
+    GError *error = NULL;
+    MMSmsProperties *properties;
+
+    properties = mm_sms_properties_new_from_string (properties_string, &error);
+    if (!properties) {
+        g_printerr ("error: cannot parse properties string: '%s'\n", error->message);
+        exit (EXIT_FAILURE);
+    }
+
+    if (data_file) {
+        gchar *path;
+        GFile *file;
+        gchar *contents;
+        gsize contents_size;
+
+        g_debug ("Reading data from file '%s'", data_file);
+
+        file = g_file_new_for_commandline_arg (data_file);
+        path = g_file_get_path (file);
+        if (!g_file_get_contents (path,
+                                  &contents,
+                                  &contents_size,
+                                  &error)) {
+            g_printerr ("error: cannot read from file '%s': '%s'\n",
+                        data_file, error->message);
+            exit (EXIT_FAILURE);
+        }
+        g_free (path);
+        g_object_unref (file);
+
+        mm_sms_properties_set_data (properties, (guint8 *)contents, contents_size);
+    }
+
+    return properties;
+}
+
 static void
 print_messaging_status (void)
 {
@@ -311,15 +362,10 @@ get_modem_ready (GObject      *source,
 
     /* Request to create a new SMS? */
     if (create_str) {
-        GError *error = NULL;
         MMSmsProperties *properties;
 
-        properties = mm_sms_properties_new_from_string (create_str, &error);
-        if (!properties) {
-            g_printerr ("Error parsing properties string: '%s'\n", error->message);
-            exit (EXIT_FAILURE);
-        }
-
+        properties = build_sms_properties_from_input (create_str,
+                                                      create_with_data_str);
         g_debug ("Asynchronously creating new SMS in modem...");
         mm_modem_messaging_create (ctx->modem_messaging,
                                    properties,
@@ -401,12 +447,8 @@ mmcli_modem_messaging_run_synchronous (GDBusConnection *connection)
         GError *error = NULL;
         MMSmsProperties *properties;
 
-        properties = mm_sms_properties_new_from_string (create_str, &error);
-        if (!properties) {
-            g_printerr ("Error parsing properties string: '%s'\n", error->message);
-            exit (EXIT_FAILURE);
-        }
-
+        properties = build_sms_properties_from_input (create_str,
+                                                      create_with_data_str);
         g_debug ("Synchronously creating new SMS in modem...");
         sms = mm_modem_messaging_create_sync (ctx->modem_messaging,
                                               properties,