Changeset 888207c9 in mainline for uspace/app


Ignore:
Timestamp:
2011-09-07T22:19:24Z (14 years ago)
Author:
Jakub Jermar <jakub@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
2aeec8ef
Parents:
038b289 (diff), 5081276 (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 from lp:~helenos-posix/helenos/devel.

  • Petr Koupy's port of binutils.
  • Jiri Zarevucky's port of pcc.
  • Petr and Jiri's libposix library.
  • Changes needed to make it all work together.
Location:
uspace/app
Files:
231 added
5 edited

Legend:

Unmodified
Added
Removed

  • uspace/app/bdsh/Makefile

    r038b289 r888207c9  
    5151        cmds/modules/unmount/unmount.c \
    5252        cmds/modules/kcon/kcon.c \
     53        cmds/builtins/batch/batch.c \
    5354        cmds/builtins/exit/exit.c \
    5455        cmds/builtins/cd/cd.c \

  • uspace/app/bdsh/cmds/builtins/builtins.h

    r038b289 r888207c9  
    44#include "config.h"
    55
     6#include "batch/entry.h"
    67#include "cd/entry.h"
    78#include "exit/entry.h"
    89
    910builtin_t builtins[] = {
     11#include "batch/batch_def.h"
    1012#include "cd/cd_def.h"
    1113#include "exit/exit_def.h"

  • uspace/app/bdsh/exec.c

    r038b289 r888207c9  
    134134                printf("%s: Failed waiting for command (%s)\n", progname,
    135135                    str_error(rc));
     136                return 1;
    136137        } else if (texit != TASK_EXIT_NORMAL) {
    137138                printf("%s: Command failed (unexpectedly terminated)\n", progname);
     139                return 1;
    138140        } else if (retval != 0) {
    139141                printf("%s: Command failed (exit code %d)\n",
    140142                    progname, retval);
     143                return 1;
    141144        }
    142145

  • uspace/app/bdsh/input.c

    r038b289 r888207c9  
    196196                new_iostate.stdout = to;
    197197        }
    198        
     198
    199199        rc = run_command(cmd, usr, &new_iostate);
    200200       

  • uspace/app/tetris/tetris.c

    r038b289 r888207c9  
    291291                for (j = i + 1; j <= 5; j++) {
    292292                        if (keys[i] == keys[j])
    293                                 errx(1, "duplicate command keys specified.");
     293                                errx(1, "%s", "duplicate command keys specified.");
    294294                }
    295295               
Note: See TracChangeset for help on using the changeset viewer.