projects
/
platform
/
upstream
/
dbus.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'dbus-1.4'
[platform/upstream/dbus.git]
/
tools
/
dbus-send.c
diff --git
a/tools/dbus-send.c
b/tools/dbus-send.c
index
81a9c37
..
e403a58
100644
(file)
--- a/
tools/dbus-send.c
+++ b/
tools/dbus-send.c
@@
-15,7
+15,7
@@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 5
9 Temple Place, Suite 330, Boston, MA 02111-1307
USA
+ * Foundation, Inc., 5
1 Franklin Street, Fifth Floor, Boston, MA 02110-1301
USA
*
*/
*
*/
@@
-26,6
+26,24
@@
#include <dbus/dbus.h>
#include <dbus/dbus.h>
+#ifndef HAVE_STRTOLL
+#undef strtoll
+#define strtoll mystrtoll
+#include "strtoll.c"
+#endif
+
+#ifndef HAVE_STRTOULL
+#undef strtoull
+#define strtoull mystrtoull
+#include "strtoull.c"
+#endif
+
+#ifdef DBUS_WINCE
+#ifndef strdup
+#define strdup _strdup
+#endif
+#endif
+
#include "dbus-print-message.h"
static const char *appname;
#include "dbus-print-message.h"
static const char *appname;
@@
-33,7
+51,7
@@
static const char *appname;
static void
usage (int ecode)
{
static void
usage (int ecode)
{
- fprintf (stderr, "Usage: %s [--help] [--system | --session | --address=ADDRESS] [--dest=NAME] [--type=TYPE] [--print-reply
=(literal)
] [--reply-timeout=MSEC] <destination object path> <message name> [contents ...]\n", appname);
+ fprintf (stderr, "Usage: %s [--help] [--system | --session | --address=ADDRESS] [--dest=NAME] [--type=TYPE] [--print-reply
[=literal]
] [--reply-timeout=MSEC] <destination object path> <message name> [contents ...]\n", appname);
exit (ecode);
}
exit (ecode);
}
@@
-284,10
+302,8
@@
main (int argc, char *argv[])
usage (1);
else if (path == NULL)
path = arg;
usage (1);
else if (path == NULL)
path = arg;
- else
if (name == NULL)
+ else
/* name == NULL guaranteed by the 'while' loop */
name = arg;
name = arg;
- else
- usage (1);
}
if (name == NULL)
}
if (name == NULL)