Changeset 97c7682 in mainline for uspace/lib/posix/getopt.c

Timestamp:

2012-07-14T11:18:40Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

804d9b6

Parents:

0747468 (diff), f0348c8 (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.

Text conflict in boot/arch/arm32/Makefile.inc:

Trivial conflict around ifeq condition.

Text conflict in kernel/arch/arm32/include/mm/page.h:

Added defines and set_pt_levelx_present function.
COnflict looked horrible because of the armv4/v7 split.

File:

• uspace/lib/posix/getopt.c (moved) (moved from uspace/lib/net/nil/nil_remote.c ) (2 diffs)

uspace/lib/posix/getopt.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2009 Lukas Mejdrech
+ * Copyright (c) 2012 Vojtech Horky
  * All rights reserved.
  *
@@ -27 +27 @@
  */
 
-/** @addtogroup libnet
+/** @addtogroup libposix
  * @{
  */
+/** @file Command line argument parsing.
+ */
+#define LIBPOSIX_INTERNAL
 
-/** @file
- * Network interface layer interface implementation for remote modules.
- * @see nil_remote.h
- */
+#include "internal/common.h"
+#include "libc/getopt.h"
+#include "getopt.h"
 
-#include <ipc/loc.h>
-#include <nil_remote.h>
-#include <generic.h>
-#include <net/device.h>
-#include <net/packet.h>
-#include <packet_client.h>
-#include <ipc/nil.h>
 
-int nil_device_req(async_sess_t *sess, nic_device_id_t device_id,
-    service_id_t sid, size_t mtu)
+int posix_getopt_long(int argc, char * const argv[],
+    const char *opt_string, const struct option *long_opts, int *long_index)
 {
-        async_exch_t *exch = async_exchange_begin(sess);
-        int rc = async_req_3_0(exch, NET_NIL_DEVICE, (sysarg_t) device_id,
-            (sysarg_t) sid, (sysarg_t) mtu);
-        async_exchange_end(exch);
+        int rc = getopt_long(argc, argv, opt_string, long_opts, long_index);
+        posix_optarg = (char *) optarg;
         return rc;
 }
 
-/** @}
- */
+int posix_getopt(int argc, char * const argv[], const char *opt_string)
+{
+        int rc = getopt(argc, argv, opt_string);
+        posix_optarg = (char *) optarg;
+        return rc;
+}