Changeset fcfac250 in mainline

Timestamp:

2011-08-21T08:15:13Z (13 years ago)

Author:

Martin Sucha <sucha14@…>

Branches:

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

Children:

19d007e

Parents:

e406736

Message:

Use proper formula to calculate number of spaces between words when using ALIGN_JUSITFY

Location:

uspace

Files:

• app/bdsh/cmds/modules/help/help.c (modified) (1 diff)
• lib/fmtutil/fmtutil.c (modified) (1 diff)

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

@@ -153 +153 @@
             "To learn more please point your browser to the HelenOS User's "
             "Guide: http://trac.helenos.org/trac.fcgi/wiki/UsersGuide\n\n",
-             ALIGN_LEFT);
+             ALIGN_JUSTIFY);
 }
 

uspace/lib/fmtutil/fmtutil.c

@@ -145 +145 @@
                         if (i == len) break;
                         if (done_words) {
-                                // TODO: use better formula
-                                size_t spaces = 1 + (excess_spaces /
-                                    (words - 1));
+                                size_t spaces = 1 + (((done_words *
+                                    excess_spaces) / (words - 1)) -
+                                    (((done_words - 1) * excess_spaces) /
+                                    (words - 1)));
                                 for (j = 0; j < spaces; j++) {
                                         putchar(' ');