Changeset 371bd7d in mainline for uspace/app/getterm

Timestamp:

2010-03-27T09:22:17Z (16 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

36a75a2

Parents:

cd82bb1 (diff), eaf22d4 (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.

Location:

uspace/app/getterm

Files:

• Makefile (moved) (moved from uspace/app/redir/Makefile.common ) (2 diffs)
• Makefile.build (moved) (moved from uspace/app/getvc/Makefile.build )
• Makefile.common (moved) (moved from uspace/app/getvc/Makefile.common )
• getterm.c (moved) (moved from uspace/app/getvc/getvc.c ) (3 diffs)
• getterm.h (moved) (moved from uspace/app/getvc/getvc.h ) (2 diffs)
• version.c (moved) (moved from uspace/app/getvc/version.c ) (2 diffs)
• version.h (moved) (moved from uspace/app/getvc/version.h ) (2 diffs)

uspace/app/getterm/Makefile

@@ -1 +1 @@
 #
 # Copyright (c) 2005 Martin Decky
+# Copyright (c) 2007 Jakub Jermar
 # All rights reserved.
 #
@@ -27 +28 @@
 #
 
+USPACE_PREFIX = ../..
+DEFS = -DRELEASE=$(RELEASE) "-DNAME=$(NAME)"
+BINARY = getterm
 
-## Common names
-#
+SOURCES = \
+        getterm.c \
+        version.c
 
-LIBC_PREFIX = ../../lib/libc
-SOFTINT_PREFIX = ../../lib/softint
-LIBS = $(LIBC_PREFIX)/libc.a
-
-DEPEND = Makefile.depend
-DEPEND_PREV = $(DEPEND).prev
-OUTPUT = redir
+include $(USPACE_PREFIX)/Makefile.common

uspace/app/getterm/getterm.c

@@ -27 +27 @@
  */
 
-/** @addtogroup getvc GetVC
+/** @addtogroup getterm GetTerm
  * @brief Console initialization task.
  * @{
@@ -44 +44 @@
 static void usage(void)
 {
-        printf("Usage: getvc <device> <path>\n");
+        printf("Usage: getterm <terminal> <path>\n");
 }
 
@@ -69 +69 @@
 }
 
-static task_id_t spawn(char *fname)
+static task_id_t spawn(const char *fname)
 {
-        char *args[2];
+        const char *args[2];
         
         args[0] = fname;

uspace/app/getterm/getterm.h

@@ -27 +27 @@
  */
 
-/** @addtogroup getvc
+/** @addtogroup getterm
  * @{
  */
@@ -34 +34 @@
  */
 
-#ifndef GETVC_H__
-#define GETVC_H__
+#ifndef GETTERM_H__
+#define GETTERM_H__
 
 #endif

uspace/app/getterm/version.c

@@ -27 +27 @@
  */
 
-/** @addtogroup getvc
+/** @addtogroup getterm
  * @{
  */
@@ -37 +37 @@
 #include <stdio.h>
 #include <macros.h>
-#include "getvc.h"
+#include "getterm.h"
 #include "version.h"
 
-static char *release = STRING(RELEASE);
-static char *name = STRING(NAME);
-static char *arch = STRING(UARCH);
+static const char *release = STRING(RELEASE);
+static const char *name = STRING(NAME);
+static const char *arch = STRING(UARCH);
 
 #ifdef REVISION
-        static char *revision = ", revision " STRING(REVISION);
+        static const char *revision = ", revision " STRING(REVISION);
 #else
-        static char *revision = "";
+        static const char *revision = "";
 #endif
 
 #ifdef TIMESTAMP
-        static char *timestamp = "\nBuilt on " STRING(TIMESTAMP);
+        static const char *timestamp = "\nBuilt on " STRING(TIMESTAMP);
 #else
-        static char *timestamp = "";
+        static const char *timestamp = "";
 #endif
 
 /** Print version information. */
-void version_print(const char *vc)
+void version_print(const char *term)
 {
         printf("HelenOS release %s (%s)%s%s\n", release, name, revision, timestamp);
-        printf("Running on %s (%s)\n", arch, vc);
+        printf("Running on %s (%s)\n", arch, term);
         printf("Copyright (c) 2001-2009 HelenOS project\n\n");
 }

uspace/app/getterm/version.h

@@ -27 +27 @@
  */
 
-/** @addtogroup getvc
+/** @addtogroup getterm
  * @{
  */
@@ -37 +37 @@
 #define VERSION_H__
 
-extern void version_print(const char *vc);
+extern void version_print(const char *term);
 
 #endif