Changeset 16639bb in mainline for uspace/app

Timestamp:

2012-08-15T22:13:37Z (13 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

83298e8

Parents:

f7ea5400 (diff), c5a6076 (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

Files:

• edit/edit.c (modified) (1 diff)
• sportdmp/sportdmp.c (modified) (1 diff)

uspace/app/edit/edit.c

@@ -842 +842 @@
                 /* Fill until the end of display area. */
 
-                if (str_length(row_buf) < (unsigned) scr_columns)
-                        fill = scr_columns - str_length(row_buf);
+                if ((unsigned)s_column - 1 < scr_columns)
+                        fill = scr_columns - (s_column - 1);
                 else
                         fill = 0;

uspace/app/sportdmp/sportdmp.c

@@ -140 +140 @@
                 ssize_t i;
                 for (i = 0; i < read; i++) {
-                        if ((buf[i] >= 32) && (buf[i] < 128))
-                                putchar((wchar_t) buf[i]);
-                        else
-                                putchar('.');
-                        fflush(stdout);
+                        printf("%02hhx ", buf[i]);
                 }
+                fflush(stdout);
         }