Attachment 154815 Details for Bug 240298 – Better fix?

[patch] Better fix?

ls.patch (text/plain), 1.07 KB, created by Gary Benson on 2007-05-16 12:57:47 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Gary Benson

Created: 2007-05-16 12:57:47 UTC

Size: 1.07 KB

patch

obsolete

>--- src/ls.c~	2007-05-16 13:41:34.000000000 +0100
>+++ src/ls.c	2007-05-16 13:51:49.000000000 +0100
>@@ -4151,27 +4151,26 @@
>   size_t pos = 0;
>   size_t cols = calculate_columns (false);
>   struct column_info const *line_fmt = &column_info[cols - 1];
>-  size_t name_length = length_of_file_name_and_frills (cwd_file);
>+  size_t name_length = -1;
>   size_t max_name_length = line_fmt->col_arr[0];
> 
>-  /* Print first entry.  */
>-  print_file_name_and_frills (cwd_file);
>-
>-  /* Now the rest.  */
>-  for (filesno = 1; filesno < cwd_n_used; ++filesno)
>+  for (filesno = 0; filesno < cwd_n_used; ++filesno)
>     {
>       struct fileinfo const *f;
>       size_t col = filesno % cols;
> 
>-      if (col == 0)
>-	{
>-	  putchar ('\n');
>-	  pos = 0;
>-	}
>-      else
>+      if (filesno)
> 	{
>-	  indent (pos + name_length, pos + max_name_length);
>-	  pos += max_name_length;
>+	  if (col == 0)
>+	    {
>+	      putchar ('\n');
>+	      pos = 0;
>+	    }
>+	  else
>+	    {
>+	      indent (pos + name_length, pos + max_name_length);
>+	      pos += max_name_length;
>+	    }
> 	}
> 
>       f = sorted_file[filesno];

Actions: View | Diff

Attachments on bug 240298: 154815