diff --git a/ls/Session.vim b/ls/Session.vim index 419e7d73..204e6359 100644 --- a/ls/Session.vim +++ b/ls/Session.vim @@ -8,11 +8,11 @@ if expand('%') == '' && !&modified && line('$') <= 1 && getline(1) == '' let s:wipebuf = bufnr('%') endif set shortmess=aoO -badd +98 src/lib_ls_long2.c +badd +51 src/lib_ls_long2.c badd +23 src/ft_ls_long.c -badd +7 includes/ft_ls.h +badd +1 includes/ft_ls.h badd +60 ~/.tmux.conf -badd +52 src/lib_ls_long.c +badd +28 src/lib_ls_long.c badd +35 src/lib_lsdata.c badd +92 src/lib_parse.c badd +22 libft/src/ft_printf/lib_pad.c @@ -44,14 +44,14 @@ badd +25 libft/src/lst/ft_lst_removeif.c badd +42 ~/.vimrc badd +12 src/ft_ent_has_dir.c badd +35 src/ft_ent_get_dirs.c -badd +20 src/lib_ent.c +badd +1 src/lib_ent.c badd +11 .Makefile.swp badd +18 ~/dotfiles/vim.symlink/plugins.vim badd +22 libft/src/str/ft_strsub.c -badd +0 libft/Makefile +badd +1 libft/Makefile badd +14 libft/src/btree/btree_print.c badd +14 libft/src/printing/ft_putaddr.c -badd +0 ~/ft_ls/libft/src/str/ft_strinsert.c +badd +1 libft/src/str/ft_strinsert.c args src/lib_ls_long2.c edit includes/ft_ls.h set splitbelow splitright @@ -63,8 +63,8 @@ set nosplitbelow set nosplitright wincmd t set winheight=1 winwidth=1 -exe 'vert 1resize ' . ((&columns * 101 + 101) / 202) -exe 'vert 2resize ' . ((&columns * 100 + 101) / 202) +exe 'vert 1resize ' . ((&columns * 90 + 90) / 181) +exe 'vert 2resize ' . ((&columns * 90 + 90) / 181) argglobal setlocal fdm=manual setlocal fde=0 @@ -75,7 +75,7 @@ setlocal fml=1 setlocal fdn=20 setlocal fen silent! normal! zE -let s:l = 61 - ((44 * winheight(0) + 40) / 80) +let s:l = 61 - ((45 * winheight(0) + 40) / 81) if s:l < 1 | let s:l = 1 | endif exe s:l normal! zt @@ -93,15 +93,15 @@ setlocal fml=1 setlocal fdn=20 setlocal fen silent! normal! zE -let s:l = 17 - ((16 * winheight(0) + 40) / 80) +let s:l = 17 - ((16 * winheight(0) + 40) / 81) if s:l < 1 | let s:l = 1 | endif exe s:l normal! zt 17 normal! 011l wincmd w -exe 'vert 1resize ' . ((&columns * 101 + 101) / 202) -exe 'vert 2resize ' . ((&columns * 100 + 101) / 202) +exe 'vert 1resize ' . ((&columns * 90 + 90) / 181) +exe 'vert 2resize ' . ((&columns * 90 + 90) / 181) tabedit src/main.c set splitbelow splitright set nosplitbelow @@ -134,8 +134,8 @@ set nosplitbelow set nosplitright wincmd t set winheight=1 winwidth=1 -exe 'vert 1resize ' . ((&columns * 101 + 101) / 202) -exe 'vert 2resize ' . ((&columns * 100 + 101) / 202) +exe 'vert 1resize ' . ((&columns * 90 + 90) / 181) +exe 'vert 2resize ' . ((&columns * 90 + 90) / 181) argglobal setlocal fdm=manual setlocal fde=0 @@ -151,7 +151,7 @@ if s:l < 1 | let s:l = 1 | endif exe s:l normal! zt 38 -normal! 011l +normal! 01l wincmd w argglobal edit src/ft_ls.c @@ -171,9 +171,31 @@ normal! zt 49 normal! 026l wincmd w -exe 'vert 1resize ' . ((&columns * 101 + 101) / 202) -exe 'vert 2resize ' . ((&columns * 100 + 101) / 202) -tabedit ~/ft_ls/libft/src/str/ft_strinsert.c +exe 'vert 1resize ' . ((&columns * 90 + 90) / 181) +exe 'vert 2resize ' . ((&columns * 90 + 90) / 181) +tabedit src/lib_ls_long2.c +set splitbelow splitright +set nosplitbelow +set nosplitright +wincmd t +set winheight=1 winwidth=1 +argglobal +setlocal fdm=manual +setlocal fde=0 +setlocal fmr={{{,}}} +setlocal fdi=# +setlocal fdl=0 +setlocal fml=1 +setlocal fdn=20 +setlocal fen +silent! normal! zE +let s:l = 1 - ((0 * winheight(0) + 40) / 80) +if s:l < 1 | let s:l = 1 | endif +exe s:l +normal! zt +1 +normal! 0 +tabedit libft/src/str/ft_strinsert.c set splitbelow splitright set nosplitbelow set nosplitright diff --git a/ls/src/lib_ent.c b/ls/src/lib_ent.c index e3e7f05a..c77fa4ea 100644 --- a/ls/src/lib_ent.c +++ b/ls/src/lib_ent.c @@ -6,7 +6,7 @@ /* By: jhalford +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2016/11/07 15:00:05 by jhalford #+# #+# */ -/* Updated: 2016/11/21 14:34:29 by jhalford ### ########.fr */ +/* Updated: 2016/11/21 17:22:13 by jhalford ### ########.fr */ /* */ /* ************************************************************************** */ diff --git a/ls/src/lib_ls_long.c b/ls/src/lib_ls_long.c index 70f83605..c4586250 100644 --- a/ls/src/lib_ls_long.c +++ b/ls/src/lib_ls_long.c @@ -6,7 +6,7 @@ /* By: jhalford +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2016/11/07 14:59:51 by jhalford #+# #+# */ -/* Updated: 2016/11/16 17:59:58 by jhalford ### ########.fr */ +/* Updated: 2016/11/21 17:22:25 by jhalford ### ########.fr */ /* */ /* ************************************************************************** */ diff --git a/ls/src/lib_ls_long2.c b/ls/src/lib_ls_long2.c index 4b220c70..84f93514 100644 --- a/ls/src/lib_ls_long2.c +++ b/ls/src/lib_ls_long2.c @@ -6,7 +6,7 @@ /* By: jhalford +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2016/11/07 15:01:01 by jhalford #+# #+# */ -/* Updated: 2016/11/16 17:51:27 by jhalford ### ########.fr */ +/* Updated: 2016/11/21 17:29:24 by jhalford ### ########.fr */ /* */ /* ************************************************************************** */ @@ -16,13 +16,22 @@ void ft_ls_long_rights(mode_t m) { ft_putchar(m & S_IRUSR ? 'r' : '-'); ft_putchar(m & S_IWUSR ? 'w' : '-'); - ft_putchar(m & S_IXUSR ? 'x' : '-'); + if (m & S_ISUID) + ft_putchar(m & S_IXUSR ? 's' : 'S'); + else + ft_putchar(m & S_IXUSR ? 'x' : '-'); ft_putchar(m & S_IRGRP ? 'r' : '-'); ft_putchar(m & S_IWGRP ? 'w' : '-'); - ft_putchar(m & S_IXGRP ? 'x' : '-'); + if (m & S_ISGID) + ft_putchar(m & S_IXGRP ? 's' : 'S'); + else + ft_putchar(m & S_IXGRP ? 'x' : '-'); ft_putchar(m & S_IROTH ? 'r' : '-'); ft_putchar(m & S_IWOTH ? 'w' : '-'); - ft_putchar(m & S_IXOTH ? 'x' : '-'); + if (m & S_ISVTX) + ft_putchar(m & S_IXOTH ? 't' : 'T'); + else + ft_putchar(m & S_IXOTH ? 'x' : '-'); } int ft_ls_long_lnk(t_lsdata *data)