Changeset 6843a9c in mainline for uspace/app/bdsh/cmds/modules/echo/echo.c

Timestamp:

2012-06-29T13:02:14Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

722912e

Parents:

ba72f2b (diff), 0bbd13e (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes

Trivial conflicts.

File:

• uspace/app/bdsh/cmds/modules/echo/echo.c (moved) (moved from uspace/lib/c/generic/net/icmp_common.c ) (2 diffs)

uspace/app/bdsh/cmds/modules/echo/echo.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2009 Lukas Mejdrech
+ * Copyright (c) 2012 Alexander Prutkov
  * All rights reserved.
  *
@@ -27 +27 @@
  */
 
-/** @addtogroup libc
- *  @{
- */
+#include <stdio.h>
+#include <stdlib.h>
+#include "config.h"
+#include "util.h"
+#include "errors.h"
+#include "entry.h"
+#include "echo.h"
+#include "cmds.h"
+#include "errno.h"
 
-/** @file
- * ICMP common interface implementation.
- * @see icmp_common.h
- */
+static const char *cmdname = "echo";
 
-#include <net/modules.h>
-#include <net/icmp_common.h>
-#include <ipc/services.h>
-#include <ipc/icmp.h>
-#include <sys/time.h>
-#include <async.h>
+void help_cmd_echo(unsigned int level)
+{
+        if (level == HELP_SHORT) {
+                printf("`%s' prints arguments as they are, followed by a new line.\n", cmdname);
+        } else {
+                help_cmd_echo(HELP_SHORT);
+                printf("Usage:  %s [arg ...]\n", cmdname);
+        }
 
-/** Connect to the ICMP module.
- *
- * @return ICMP module session.
- *
- */
-async_sess_t *icmp_connect_module(void)
-{
-        return connect_to_service(SERVICE_ICMP);
+        return;
 }
 
-/** @}
- */
+/* Main entry point for echo, accepts an array of arguments */
+int cmd_echo(char **argv)
+{
+        unsigned int argc;
+
+        for (argc = 1; argv[argc] != NULL; argc ++) {
+                printf("%s ", argv[argc]);
+        }
+        printf("\n");
+        return CMD_SUCCESS;
+
+}
+